From 7ddf1f5830239e78ec3faf9e15e050df9a5afdaa Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Thu, 26 Mar 2020 14:34:53 -0700
Subject: [PATCH] Shorten generated  test resource paths

---
 .../github/junit/GitHubWireMockRule.java      | 72 ++++++++++++++-----
 ...org_temp-testratelimithandler_fail-3.json} |  0
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 ...mp-testratelimithandler_fail-3-574da1.json | 50 -------------
 ...-org_temp-testratelimithandler_fail-3.json | 50 +++++++++++++
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../testHandler_Fail/mappings/user-1.json     | 48 +++++++++++++
 ...org_temp-testratelimithandler_fail-3.json} |  0
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 ...mp-testratelimithandler_fail-3-574da1.json | 50 -------------
 ...-org_temp-testratelimithandler_fail-3.json | 50 +++++++++++++
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...org_temp-testratelimithandler_fail-3.json} |  0
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 ...mp-testratelimithandler_fail-3-574da1.json | 50 -------------
 ...-org_temp-testratelimithandler_fail-3.json | 50 +++++++++++++
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../testHandler_Wait/mappings/user-1.json     | 48 +++++++++++++
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...3f2fc5b8c2ba47dd677d0b0c7583539584d-3.txt} |  0
 ...f2fc5b8c2ba47dd677d0b0c7583539584d-4.json} |  0
 ...604-a534-b734e99d9e15.json => user-1.json} |  0
 .../repos_github-api_github-api-2-db8eac.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...8c2ba47dd677d0b0c7583539584d-3-6408bc.json | 50 -------------
 ...3f2fc5b8c2ba47dd677d0b0c7583539584d-3.json | 50 +++++++++++++
 ...8c2ba47dd677d0b0c7583539584d-4-72e1ca.json | 49 -------------
 ...3f2fc5b8c2ba47dd677d0b0c7583539584d-4.json | 49 +++++++++++++
 .../wiremock/blob/mappings/user-1-8996d0.json | 48 -------------
 .../wiremock/blob/mappings/user-1.json        | 48 +++++++++++++
 ...39.json => repos_jenkinsci_jenkins-2.json} |  0
 ...os_jenkinsci_jenkins_contents_core-3.json} |  0
 ...enkinsci_jenkins_contents_core_src-4.json} |  0
 ...2f5-a4b5-9d5472b2a56b.json => user-1.json} |  0
 .../repos_jenkinsci_jenkins-2-448d3f.json     | 48 -------------
 .../mappings/repos_jenkinsci_jenkins-2.json   | 48 +++++++++++++
 ...kinsci_jenkins_contents_core-3-7e1b6c.json | 48 -------------
 ...pos_jenkinsci_jenkins_contents_core-3.json | 48 +++++++++++++
 ...ci_jenkins_contents_core_src-4-0566ab.json | 48 -------------
 ...jenkinsci_jenkins_contents_core_src-4.json | 48 +++++++++++++
 .../mappings/user-1-0cdbd9.json               | 48 -------------
 .../directoryListing/mappings/user-1.json     | 48 +++++++++++++
 ...5cf-8182-9e7926d5231e.json => user-1.json} |  0
 ...6335.json => user_memberships_orgs-2.json} |  0
 .../mappings/user-1-8636c5.json               | 48 -------------
 .../listOrgMemberships/mappings/user-1.json   | 48 +++++++++++++
 .../user_memberships_orgs-2-29d7ac.json       | 47 ------------
 .../mappings/user_memberships_orgs-2.json     | 47 ++++++++++++
 ...c42a6f013ae.json => notifications-10.json} |  0
 ...4ad66d59f30.json => notifications-11.json} |  0
 ...9cdd79a79e4.json => notifications-12.json} |  0
 ...a2d90a2753a.json => notifications-13.json} |  0
 ...2ba76eae729.json => notifications-14.json} |  0
 ...edc712c5d59.json => notifications-15.json} |  0
 ...403e82ae5d9.json => notifications-16.json} |  0
 ...b14797afe0a.json => notifications-17.json} |  0
 ...391944ec7ca.json => notifications-18.json} |  0
 ...9370f22db96.json => notifications-19.json} |  0
 ...1b9aef03ef55.json => notifications-2.json} |  0
 ...f4ca3d81226.json => notifications-20.json} |  0
 ...0cae80258e3.json => notifications-21.json} |  0
 ...885d88c10b1.json => notifications-22.json} |  0
 ...ae9ec919af2.json => notifications-23.json} |  0
 ...26103c40b83.json => notifications-24.json} |  0
 ...3e9c79c725c.json => notifications-26.json} |  0
 ...52c1f3be4b91.json => notifications-3.json} |  0
 ...effcad5c6ebd.json => notifications-4.json} |  0
 ...59fc459920d3.json => notifications-5.json} |  0
 ...814a0841839e.json => notifications-6.json} |  0
 ...10dedac5f779.json => notifications-7.json} |  0
 ...66fde88ef05b.json => notifications-8.json} |  0
 ...758573c2349a.json => notifications-9.json} |  0
 ...395-9e5c-21604abb77ec.json => user-1.json} |  0
 .../mappings/notifications-10-a97934.json     | 50 -------------
 .../mappings/notifications-10.json            | 50 +++++++++++++
 .../mappings/notifications-11-89714e.json     | 50 -------------
 .../mappings/notifications-11.json            | 50 +++++++++++++
 .../mappings/notifications-12-2b7183.json     | 50 -------------
 .../mappings/notifications-12.json            | 50 +++++++++++++
 .../mappings/notifications-13-989db4.json     | 50 -------------
 .../mappings/notifications-13.json            | 50 +++++++++++++
 .../mappings/notifications-14-50b907.json     | 50 -------------
 .../mappings/notifications-14.json            | 50 +++++++++++++
 .../mappings/notifications-15-f2648b.json     | 50 -------------
 .../mappings/notifications-15.json            | 50 +++++++++++++
 .../mappings/notifications-16-ee5a6c.json     | 50 -------------
 .../mappings/notifications-16.json            | 50 +++++++++++++
 .../mappings/notifications-17-a41aee.json     | 50 -------------
 .../mappings/notifications-17.json            | 50 +++++++++++++
 .../mappings/notifications-18-e1d519.json     | 50 -------------
 .../mappings/notifications-18.json            | 50 +++++++++++++
 .../mappings/notifications-19-1b6948.json     | 50 -------------
 .../mappings/notifications-19.json            | 50 +++++++++++++
 .../mappings/notifications-2-d85867.json      | 50 -------------
 .../mappings/notifications-2.json             | 50 +++++++++++++
 .../mappings/notifications-20-489082.json     | 50 -------------
 .../mappings/notifications-20.json            | 50 +++++++++++++
 .../mappings/notifications-21-42be65.json     | 50 -------------
 .../mappings/notifications-21.json            | 50 +++++++++++++
 .../mappings/notifications-22-5720c4.json     | 50 -------------
 .../mappings/notifications-22.json            | 50 +++++++++++++
 .../mappings/notifications-23-045c36.json     | 50 -------------
 .../mappings/notifications-23.json            | 50 +++++++++++++
 .../mappings/notifications-24-bfc773.json     | 50 -------------
 .../mappings/notifications-24.json            | 50 +++++++++++++
 .../mappings/notifications-26-ac22e3.json     | 50 -------------
 .../mappings/notifications-26.json            | 50 +++++++++++++
 .../mappings/notifications-3-d96172.json      | 50 -------------
 .../mappings/notifications-3.json             | 50 +++++++++++++
 .../mappings/notifications-4-6dea52.json      | 50 -------------
 .../mappings/notifications-4.json             | 50 +++++++++++++
 .../mappings/notifications-5-a8e944.json      | 50 -------------
 .../mappings/notifications-5.json             | 50 +++++++++++++
 .../mappings/notifications-6-2658e9.json      | 50 -------------
 .../mappings/notifications-6.json             | 50 +++++++++++++
 .../mappings/notifications-7-f25246.json      | 50 -------------
 .../mappings/notifications-7.json             | 50 +++++++++++++
 .../mappings/notifications-8-943718.json      | 50 -------------
 .../mappings/notifications-8.json             | 50 +++++++++++++
 .../mappings/notifications-9-1de525.json      | 50 -------------
 .../mappings/notifications-9.json             | 50 +++++++++++++
 ...> notifications_threads_523050578-25.json} |  0
 .../notifications/mappings/user-1-8439ce.json | 48 -------------
 .../notifications/mappings/user-1.json        | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...s_github-api_github-api_issues_311-3.json} |  0
 ...i_github-api_issues_311_reactions-10.json} |  0
 ...i_github-api_issues_311_reactions-11.json} |  0
 ...i_github-api_issues_311_reactions-12.json} |  0
 ...i_github-api_issues_311_reactions-17.json} |  0
 ...pi_github-api_issues_311_reactions-4.json} |  0
 ...pi_github-api_issues_311_reactions-5.json} |  0
 ...pi_github-api_issues_311_reactions-7.json} |  0
 ...pi_github-api_issues_311_reactions-8.json} |  0
 ...pi_github-api_issues_311_reactions-9.json} |  0
 ...fd9-b995-51e933b769f3.json => user-1.json} |  0
 ...-b59615.json => reactions_63220302-6.json} |  0
 ...cf170d.json => reactions_63220303-13.json} |  0
 ...dcbdbe.json => reactions_63220305-14.json} |  0
 ...08b50a.json => reactions_63220306-15.json} |  0
 ...12cbca.json => reactions_63220307-16.json} |  0
 .../repos_github-api_github-api-2-66f6b3.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...ub-api_github-api_issues_311-3-1e8e21.json | 48 -------------
 ...os_github-api_github-api_issues_311-3.json | 48 +++++++++++++
 ...ub-api_issues_311_reactions-10-1a3642.json | 54 --------------
 ...pi_github-api_issues_311_reactions-10.json | 54 ++++++++++++++
 ...ub-api_issues_311_reactions-11-41bca5.json | 54 --------------
 ...pi_github-api_issues_311_reactions-11.json | 54 ++++++++++++++
 ...ub-api_issues_311_reactions-12-ec5b45.json | 50 -------------
 ...pi_github-api_issues_311_reactions-12.json | 50 +++++++++++++
 ...ub-api_issues_311_reactions-17-e6be4f.json | 49 -------------
 ...pi_github-api_issues_311_reactions-17.json | 49 +++++++++++++
 ...hub-api_issues_311_reactions-4-a94639.json | 50 -------------
 ...api_github-api_issues_311_reactions-4.json | 50 +++++++++++++
 ...hub-api_issues_311_reactions-5-dfcc4b.json | 54 --------------
 ...api_github-api_issues_311_reactions-5.json | 54 ++++++++++++++
 ...hub-api_issues_311_reactions-7-39f59d.json | 50 -------------
 ...api_github-api_issues_311_reactions-7.json | 50 +++++++++++++
 ...hub-api_issues_311_reactions-8-d9de82.json | 54 --------------
 ...api_github-api_issues_311_reactions-8.json | 54 ++++++++++++++
 ...hub-api_issues_311_reactions-9-9904f1.json | 54 --------------
 ...api_github-api_issues_311_reactions-9.json | 54 ++++++++++++++
 .../reactions/mappings/user-1-d9a254.json     | 48 -------------
 .../wiremock/reactions/mappings/user-1.json   | 48 +++++++++++++
 ...05ca1998d9a.json => orgs_jenkinsci-2.json} |  0
 ...d35-953f-e99ef59186eb.json => user-1.json} |  0
 ...-b0ad-b80aab3b0a50.json => users_b-4.json} |  0
 ...396937282c09.json => users_kohsuke-3.json} |  0
 .../mappings/orgs_jenkinsci-2-0d9fbe.json     | 48 -------------
 .../mappings/orgs_jenkinsci-2.json            | 48 +++++++++++++
 ...8.json => orgs_jenkinsci_members_b-6.json} |  0
 ... => orgs_jenkinsci_members_kohsuke-5.json} |  0
 ...=> orgs_jenkinsci_public_members_b-8.json} |  0
 ...s_jenkinsci_public_members_kohsuke-7.json} |  0
 .../mappings/user-1-1f8ee7.json               | 48 -------------
 .../testCheckMembership/mappings/user-1.json  | 48 +++++++++++++
 .../mappings/users_b-4-6d6a6b.json            | 48 -------------
 .../mappings/users_b-4.json                   | 48 +++++++++++++
 .../mappings/users_kohsuke-3-6fc7a5.json      | 48 -------------
 .../mappings/users_kohsuke-3.json             | 48 +++++++++++++
 ...ec.json => repos_jenkinsci_jenkins-3.json} |  0
 ...970af4d609ae754fbe803e06186e3206f7-4.json} |  0
 ...3d53fdf74e917d63dc44ec60bab60a24d4-5.json} |  0
 ...7eb6b24cb3ee300cf9dfe97b4131b7800b-8.json} |  0
 ...8b7231571b49af150a683177f37a180f04-6.json} |  0
 ...9c5-af35-56e5b63ef972.json => user-1.json} |  0
 ...91372110eb.json => users_jenkinsci-2.json} |  0
 .../repos_jenkinsci_jenkins-3-f502af.json     | 48 -------------
 .../mappings/repos_jenkinsci_jenkins-3.json   | 48 +++++++++++++
 ...d609ae754fbe803e06186e3206f7-4-c46f8b.json | 48 -------------
 ...9970af4d609ae754fbe803e06186e3206f7-4.json | 48 +++++++++++++
 ...f74e917d63dc44ec60bab60a24d4-5-8ff720.json | 48 -------------
 ...e3d53fdf74e917d63dc44ec60bab60a24d4-5.json | 48 +++++++++++++
 ...651cbf44196886f87327dc3968443174fb-7.json} |  0
 ...4cb3ee300cf9dfe97b4131b7800b-8-ba2250.json | 48 -------------
 ...57eb6b24cb3ee300cf9dfe97b4131b7800b-8.json | 48 +++++++++++++
 ...571b49af150a683177f37a180f04-6-d30d65.json | 48 -------------
 ...e8b7231571b49af150a683177f37a180f04-6.json | 48 +++++++++++++
 .../testCommit/mappings/user-1-bddf38.json    | 48 -------------
 .../wiremock/testCommit/mappings/user-1.json  | 48 +++++++++++++
 .../mappings/users_jenkinsci-2-0eb973.json    | 48 -------------
 .../mappings/users_jenkinsci-2.json           | 48 +++++++++++++
 ...d7.json => repos_jenkinsci_jenkins-3.json} |  0
 ...> repos_jenkinsci_jenkins_comments-4.json} |  0
 ...c7a-84fa-bf39e150869d.json => user-1.json} |  0
 ...0330abb3dd.json => users_jenkinsci-2.json} |  0
 .../repos_jenkinsci_jenkins-3-fe185a.json     | 48 -------------
 .../mappings/repos_jenkinsci_jenkins-3.json   | 48 +++++++++++++
 ...s_jenkinsci_jenkins_comments-4-c4ee8b.json | 48 -------------
 .../repos_jenkinsci_jenkins_comments-4.json   | 48 +++++++++++++
 .../mappings/user-1-b9ac0e.json               | 48 -------------
 .../testCommitComment/mappings/user-1.json    | 48 +++++++++++++
 .../mappings/users_jenkinsci-2-2443ea.json    | 48 -------------
 .../mappings/users_jenkinsci-2.json           | 48 +++++++++++++
 ...on => repos_github-api_github-api-10.json} |  0
 ...on => repos_github-api_github-api-11.json} |  0
 ...on => repos_github-api_github-api-12.json} |  0
 ...on => repos_github-api_github-api-13.json} |  0
 ...on => repos_github-api_github-api-14.json} |  0
 ...on => repos_github-api_github-api-15.json} |  0
 ...on => repos_github-api_github-api-16.json} |  0
 ...on => repos_github-api_github-api-17.json} |  0
 ...on => repos_github-api_github-api-18.json} |  0
 ...on => repos_github-api_github-api-19.json} |  0
 ...on => repos_github-api_github-api-20.json} |  0
 ...on => repos_github-api_github-api-21.json} |  0
 ...on => repos_github-api_github-api-22.json} |  0
 ...on => repos_github-api_github-api-23.json} |  0
 ...on => repos_github-api_github-api-24.json} |  0
 ...on => repos_github-api_github-api-25.json} |  0
 ...on => repos_github-api_github-api-26.json} |  0
 ...on => repos_github-api_github-api-27.json} |  0
 ...on => repos_github-api_github-api-28.json} |  0
 ...on => repos_github-api_github-api-29.json} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...on => repos_github-api_github-api-30.json} |  0
 ...on => repos_github-api_github-api-31.json} |  0
 ...on => repos_github-api_github-api-32.json} |  0
 ...on => repos_github-api_github-api-34.json} |  0
 ...on => repos_github-api_github-api-35.json} |  0
 ...on => repos_github-api_github-api-36.json} |  0
 ...on => repos_github-api_github-api-37.json} |  0
 ...on => repos_github-api_github-api-38.json} |  0
 ...on => repos_github-api_github-api-39.json} |  0
 ...son => repos_github-api_github-api-4.json} |  0
 ...on => repos_github-api_github-api-40.json} |  0
 ...on => repos_github-api_github-api-41.json} |  0
 ...on => repos_github-api_github-api-42.json} |  0
 ...on => repos_github-api_github-api-43.json} |  0
 ...on => repos_github-api_github-api-44.json} |  0
 ...on => repos_github-api_github-api-45.json} |  0
 ...on => repos_github-api_github-api-46.json} |  0
 ...on => repos_github-api_github-api-47.json} |  0
 ...on => repos_github-api_github-api-48.json} |  0
 ...on => repos_github-api_github-api-49.json} |  0
 ...son => repos_github-api_github-api-5.json} |  0
 ...on => repos_github-api_github-api-50.json} |  0
 ...on => repos_github-api_github-api-51.json} |  0
 ...on => repos_github-api_github-api-52.json} |  0
 ...on => repos_github-api_github-api-53.json} |  0
 ...on => repos_github-api_github-api-54.json} |  0
 ...on => repos_github-api_github-api-55.json} |  0
 ...on => repos_github-api_github-api-56.json} |  0
 ...on => repos_github-api_github-api-57.json} |  0
 ...on => repos_github-api_github-api-58.json} |  0
 ...on => repos_github-api_github-api-59.json} |  0
 ...son => repos_github-api_github-api-6.json} |  0
 ...on => repos_github-api_github-api-60.json} |  0
 ...on => repos_github-api_github-api-61.json} |  0
 ...on => repos_github-api_github-api-62.json} |  0
 ...on => repos_github-api_github-api-63.json} |  0
 ...son => repos_github-api_github-api-7.json} |  0
 ...son => repos_github-api_github-api-8.json} |  0
 ...son => repos_github-api_github-api-9.json} |  0
 ...66df32f717ba27d9248e5996fbbf6378c-64.json} |  0
 ...62f81037dac.json => search_commits-2.json} |  0
 ...2fdfb617cb.json => search_commits-33.json} |  0
 ...7f0-b092-29d86ff46ef5.json => user-1.json} |  0
 ...repos_github-api_github-api-10-177265.json | 51 -------------
 .../repos_github-api_github-api-10.json       | 51 +++++++++++++
 ...repos_github-api_github-api-11-480308.json | 51 -------------
 .../repos_github-api_github-api-11.json       | 51 +++++++++++++
 ...repos_github-api_github-api-12-39b4cc.json | 51 -------------
 .../repos_github-api_github-api-12.json       | 51 +++++++++++++
 ...repos_github-api_github-api-13-59105d.json | 51 -------------
 .../repos_github-api_github-api-13.json       | 51 +++++++++++++
 ...repos_github-api_github-api-14-a1c9b0.json | 51 -------------
 .../repos_github-api_github-api-14.json       | 51 +++++++++++++
 ...repos_github-api_github-api-15-918f60.json | 51 -------------
 .../repos_github-api_github-api-15.json       | 51 +++++++++++++
 ...repos_github-api_github-api-16-738e2f.json | 51 -------------
 .../repos_github-api_github-api-16.json       | 51 +++++++++++++
 ...repos_github-api_github-api-17-259335.json | 51 -------------
 .../repos_github-api_github-api-17.json       | 51 +++++++++++++
 ...repos_github-api_github-api-18-9aecf3.json | 51 -------------
 .../repos_github-api_github-api-18.json       | 51 +++++++++++++
 ...repos_github-api_github-api-19-fb9346.json | 51 -------------
 .../repos_github-api_github-api-19.json       | 51 +++++++++++++
 ...repos_github-api_github-api-20-89902c.json | 51 -------------
 .../repos_github-api_github-api-20.json       | 51 +++++++++++++
 ...repos_github-api_github-api-21-1c2b0d.json | 51 -------------
 .../repos_github-api_github-api-21.json       | 51 +++++++++++++
 ...repos_github-api_github-api-22-5f2792.json | 51 -------------
 .../repos_github-api_github-api-22.json       | 51 +++++++++++++
 ...repos_github-api_github-api-23-68f868.json | 51 -------------
 .../repos_github-api_github-api-23.json       | 51 +++++++++++++
 ...repos_github-api_github-api-24-3da25c.json | 51 -------------
 .../repos_github-api_github-api-24.json       | 51 +++++++++++++
 ...repos_github-api_github-api-25-5765a2.json | 51 -------------
 .../repos_github-api_github-api-25.json       | 51 +++++++++++++
 ...repos_github-api_github-api-26-fe73af.json | 51 -------------
 .../repos_github-api_github-api-26.json       | 51 +++++++++++++
 ...repos_github-api_github-api-27-a11d11.json | 51 -------------
 .../repos_github-api_github-api-27.json       | 51 +++++++++++++
 ...repos_github-api_github-api-28-c4fbb5.json | 51 -------------
 .../repos_github-api_github-api-28.json       | 51 +++++++++++++
 ...repos_github-api_github-api-29-7d8310.json | 51 -------------
 .../repos_github-api_github-api-29.json       | 51 +++++++++++++
 .../repos_github-api_github-api-3-c68776.json | 51 -------------
 .../repos_github-api_github-api-3.json        | 51 +++++++++++++
 ...repos_github-api_github-api-30-c300b8.json | 51 -------------
 .../repos_github-api_github-api-30.json       | 51 +++++++++++++
 ...repos_github-api_github-api-31-c363dc.json | 51 -------------
 .../repos_github-api_github-api-31.json       | 51 +++++++++++++
 ...repos_github-api_github-api-32-5f4c64.json | 51 -------------
 .../repos_github-api_github-api-32.json       | 51 +++++++++++++
 ...repos_github-api_github-api-34-1dc4cd.json | 51 -------------
 .../repos_github-api_github-api-34.json       | 51 +++++++++++++
 ...repos_github-api_github-api-35-598ba8.json | 51 -------------
 .../repos_github-api_github-api-35.json       | 51 +++++++++++++
 ...repos_github-api_github-api-36-d7fec7.json | 51 -------------
 .../repos_github-api_github-api-36.json       | 51 +++++++++++++
 ...repos_github-api_github-api-37-24a9c4.json | 51 -------------
 .../repos_github-api_github-api-37.json       | 51 +++++++++++++
 ...repos_github-api_github-api-38-11236d.json | 51 -------------
 .../repos_github-api_github-api-38.json       | 51 +++++++++++++
 ...repos_github-api_github-api-39-a4f2d2.json | 51 -------------
 .../repos_github-api_github-api-39.json       | 51 +++++++++++++
 .../repos_github-api_github-api-4-db288d.json | 51 -------------
 .../repos_github-api_github-api-4.json        | 51 +++++++++++++
 ...repos_github-api_github-api-40-d578ab.json | 51 -------------
 .../repos_github-api_github-api-40.json       | 51 +++++++++++++
 ...repos_github-api_github-api-41-8eeab8.json | 51 -------------
 .../repos_github-api_github-api-41.json       | 51 +++++++++++++
 ...repos_github-api_github-api-42-8dd6b0.json | 51 -------------
 .../repos_github-api_github-api-42.json       | 51 +++++++++++++
 ...repos_github-api_github-api-43-50679d.json | 51 -------------
 .../repos_github-api_github-api-43.json       | 51 +++++++++++++
 ...repos_github-api_github-api-44-d7c509.json | 51 -------------
 .../repos_github-api_github-api-44.json       | 51 +++++++++++++
 ...repos_github-api_github-api-45-f7ed81.json | 51 -------------
 .../repos_github-api_github-api-45.json       | 51 +++++++++++++
 ...repos_github-api_github-api-46-46e796.json | 51 -------------
 .../repos_github-api_github-api-46.json       | 51 +++++++++++++
 ...repos_github-api_github-api-47-ce3916.json | 51 -------------
 .../repos_github-api_github-api-47.json       | 51 +++++++++++++
 ...repos_github-api_github-api-48-3c19ad.json | 51 -------------
 .../repos_github-api_github-api-48.json       | 51 +++++++++++++
 ...repos_github-api_github-api-49-2b9566.json | 51 -------------
 .../repos_github-api_github-api-49.json       | 51 +++++++++++++
 .../repos_github-api_github-api-5-34380f.json | 51 -------------
 .../repos_github-api_github-api-5.json        | 51 +++++++++++++
 ...repos_github-api_github-api-50-061d63.json | 51 -------------
 .../repos_github-api_github-api-50.json       | 51 +++++++++++++
 ...repos_github-api_github-api-51-244992.json | 51 -------------
 .../repos_github-api_github-api-51.json       | 51 +++++++++++++
 ...repos_github-api_github-api-52-69de99.json | 51 -------------
 .../repos_github-api_github-api-52.json       | 51 +++++++++++++
 ...repos_github-api_github-api-53-df1433.json | 51 -------------
 .../repos_github-api_github-api-53.json       | 51 +++++++++++++
 ...repos_github-api_github-api-54-c80963.json | 51 -------------
 .../repos_github-api_github-api-54.json       | 51 +++++++++++++
 ...repos_github-api_github-api-55-68d3a2.json | 51 -------------
 .../repos_github-api_github-api-55.json       | 51 +++++++++++++
 ...repos_github-api_github-api-56-0b1ed9.json | 51 -------------
 .../repos_github-api_github-api-56.json       | 51 +++++++++++++
 ...repos_github-api_github-api-57-016aa7.json | 51 -------------
 .../repos_github-api_github-api-57.json       | 51 +++++++++++++
 ...repos_github-api_github-api-58-e0294e.json | 51 -------------
 .../repos_github-api_github-api-58.json       | 51 +++++++++++++
 ...repos_github-api_github-api-59-d52fd2.json | 51 -------------
 .../repos_github-api_github-api-59.json       | 51 +++++++++++++
 .../repos_github-api_github-api-6-91a31f.json | 51 -------------
 .../repos_github-api_github-api-6.json        | 51 +++++++++++++
 ...repos_github-api_github-api-60-93f988.json | 51 -------------
 .../repos_github-api_github-api-60.json       | 51 +++++++++++++
 ...repos_github-api_github-api-61-288d44.json | 51 -------------
 .../repos_github-api_github-api-61.json       | 51 +++++++++++++
 ...repos_github-api_github-api-62-c56228.json | 51 -------------
 .../repos_github-api_github-api-62.json       | 51 +++++++++++++
 ...repos_github-api_github-api-63-70bc80.json | 50 -------------
 .../repos_github-api_github-api-63.json       | 50 +++++++++++++
 .../repos_github-api_github-api-7-7d9426.json | 51 -------------
 .../repos_github-api_github-api-7.json        | 51 +++++++++++++
 .../repos_github-api_github-api-8-dc6c74.json | 51 -------------
 .../repos_github-api_github-api-8.json        | 51 +++++++++++++
 .../repos_github-api_github-api-9-a217bd.json | 51 -------------
 .../repos_github-api_github-api-9.json        | 51 +++++++++++++
 ...f717ba27d9248e5996fbbf6378c-64-5380ce.json | 48 -------------
 ...a66df32f717ba27d9248e5996fbbf6378c-64.json | 48 +++++++++++++
 .../mappings/search_commits-2-c94d38.json     | 47 ------------
 .../mappings/search_commits-2.json            | 47 ++++++++++++
 .../mappings/search_commits-33-44b5b3.json    | 46 ------------
 .../mappings/search_commits-33.json           | 46 ++++++++++++
 .../mappings/user-1-726152.json               | 48 -------------
 .../testCommitSearch/mappings/user-1.json     | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f23-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f23-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f23-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../testCommitShortInfo/mappings/user-1.json  | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...7315ef2cf04b2be7f11a072ce0bd00c396-3.json} |  0
 ...ece-8e5a-c1a1f8e557e4.json => user-1.json} |  0
 .../repos_github-api_github-api-2-b39326.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...2cf04b2be7f11a072ce0bd00c396-3-6fad91.json | 47 ------------
 ...d7315ef2cf04b2be7f11a072ce0bd00c396-3.json | 47 ++++++++++++
 .../mappings/user-1-83b4bb.json               | 48 -------------
 .../testCommitStatus/mappings/user-1.json     | 48 +++++++++++++
 ...ithub-api-test-org_github-api-test-2.json} |  0
 ...st-org_github-api-test_deployments-3.json} |  0
 ...st-org_github-api-test_deployments-4.json} |  0
 ...180-9b55-ca2931ca31c5.json => user-1.json} |  0
 ...api-test-org_github-api-test-2-31a86a.json | 48 -------------
 ...github-api-test-org_github-api-test-2.json | 48 +++++++++++++
 ..._github-api-test_deployments-3-702b71.json | 56 ---------------
 ...est-org_github-api-test_deployments-3.json | 56 +++++++++++++++
 ..._github-api-test_deployments-4-b4bcda.json | 47 ------------
 ...est-org_github-api-test_deployments-4.json | 47 ++++++++++++
 .../mappings/user-1-6d2dcb.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ....json => repos_kohsuke_sandbox-ant-3.json} |  0
 ...suke_sandbox-ant_comments_35673784-6.json} |  0
 ...b0ea5837313ab5f39d43a6f73de3bd9000-4.json} |  0
 ...13ab5f39d43a6f73de3bd9000_comments-5.json} |  0
 ...434-9f98-64195b0c46ce.json => user-1.json} |  0
 ...595ccb78aa41.json => users_kohsuke-2.json} |  0
 .../repos_kohsuke_sandbox-ant-3-3fd5d2.json   | 48 -------------
 .../mappings/repos_kohsuke_sandbox-ant-3.json | 48 +++++++++++++
 ...andbox-ant_comments_35673784-6-70a63f.json | 54 --------------
 ...hsuke_sandbox-ant_comments_35673784-6.json | 54 ++++++++++++++
 ...suke_sandbox-ant_comments_35673784-7.json} |  0
 ...37313ab5f39d43a6f73de3bd9000-4-d1822d.json | 48 -------------
 ...db0ea5837313ab5f39d43a6f73de3bd9000-4.json | 48 +++++++++++++
 ...39d43a6f73de3bd9000_comments-5-62d11e.json | 55 --------------
 ...313ab5f39d43a6f73de3bd9000_comments-5.json | 55 ++++++++++++++
 .../mappings/user-1-a9b48b.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 .../mappings/users_kohsuke-2-a4924f.json      | 48 -------------
 .../mappings/users_kohsuke-2.json             | 48 +++++++++++++
 ...ithub-api-test-org_github-api-test-2.json} |  0
 ...i-test-org_github-api-test_issues-10.json} |  0
 ...test-org_github-api-test_issues_1-11.json} |  0
 ...st-org_github-api-test_milestones-12.json} |  0
 ...est-org_github-api-test_milestones-9.json} |  0
 ...bc3-9004-2cec25e972f8.json => user-1.json} |  0
 ...api-test-org_github-api-test-2-2d35ce.json | 48 -------------
 ...github-api-test-org_github-api-test-2.json | 48 +++++++++++++
 ...api-test-org_github-api-test_hooks-4.json} |  0
 ...api-test-org_github-api-test_hooks-5.json} |  0
 ...api-test-org_github-api-test_hooks-7.json} |  0
 ...api-test-org_github-api-test_hooks-8.json} |  0
 ...-org_github-api-test_issues-10-4c0eec.json | 55 --------------
 ...pi-test-org_github-api-test_issues-10.json | 55 ++++++++++++++
 ...rg_github-api-test_issues_1-11-b2b352.json | 54 --------------
 ...-test-org_github-api-test_issues_1-11.json | 54 ++++++++++++++
 ..._github-api-test_milestones-12-9f6e98.json | 55 --------------
 ...est-org_github-api-test_milestones-12.json | 55 ++++++++++++++
 ...est-org_github-api-test_milestones-3.json} |  0
 ...est-org_github-api-test_milestones-6.json} |  0
 ...g_github-api-test_milestones-9-c528f3.json | 55 --------------
 ...test-org_github-api-test_milestones-9.json | 55 ++++++++++++++
 .../mappings/user-1-8104cc.json               | 48 -------------
 .../testCreateIssue/mappings/user-1.json      | 48 +++++++++++++
 ...d21-bd2a-388a13ba9832.json => user-1.json} |  0
 .../mappings/user-1-eba96b.json               | 48 -------------
 .../testCredentialValid/mappings/user-1.json  | 48 +++++++++++++
 ...-bc01-9e5d7f93ef6e.json => events-10.json} |  0
 ...-ba72-bf9eaea1dc2d.json => events-11.json} |  0
 ...f-824c-53e4db13d18a.json => events-2.json} |  0
 ...7-a3b7-f2d003b89d91.json => events-3.json} |  0
 ...b-9929-612fb9cbde1f.json => events-4.json} |  0
 ...d-b699-ed83c6edbceb.json => events-5.json} |  0
 ...8-a260-953487c97b4f.json => events-6.json} |  0
 ...c-94ea-f91ca33f5a71.json => events-7.json} |  0
 ...c-803c-6747e224509c.json => events-8.json} |  0
 ...0-9857-c44ae6ac3182.json => events-9.json} |  0
 ...2bf-acda-20cb8cc7bf8e.json => user-1.json} |  0
 .../mappings/events-10-3894dd.json            | 50 -------------
 .../testEventApi/mappings/events-10.json      | 50 +++++++++++++
 .../mappings/events-11-1f4bc3.json            | 50 -------------
 .../testEventApi/mappings/events-11.json      | 50 +++++++++++++
 .../mappings/events-2-d66da8.json             | 50 -------------
 .../testEventApi/mappings/events-2.json       | 50 +++++++++++++
 .../mappings/events-3-d3ce34.json             | 50 -------------
 .../testEventApi/mappings/events-3.json       | 50 +++++++++++++
 .../mappings/events-4-794078.json             | 50 -------------
 .../testEventApi/mappings/events-4.json       | 50 +++++++++++++
 .../mappings/events-5-5d107a.json             | 50 -------------
 .../testEventApi/mappings/events-5.json       | 50 +++++++++++++
 .../mappings/events-6-6f4a1d.json             | 50 -------------
 .../testEventApi/mappings/events-6.json       | 50 +++++++++++++
 .../mappings/events-7-6354ff.json             | 50 -------------
 .../testEventApi/mappings/events-7.json       | 50 +++++++++++++
 .../mappings/events-8-3719d1.json             | 50 -------------
 .../testEventApi/mappings/events-8.json       | 50 +++++++++++++
 .../mappings/events-9-982884.json             | 50 -------------
 .../testEventApi/mappings/events-9.json       | 50 +++++++++++++
 .../testEventApi/mappings/user-1-01c5f6.json  | 48 -------------
 .../testEventApi/mappings/user-1.json         | 48 +++++++++++++
 ...070d9bc0c2.json => orgs_github-api-2.json} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...repos_github-api_github-api_issues-4.json} |  0
 ...son => repositories_617210_issues-10.json} |  0
 ...son => repositories_617210_issues-11.json} |  0
 ...son => repositories_617210_issues-12.json} |  0
 ...son => repositories_617210_issues-13.json} |  0
 ...son => repositories_617210_issues-14.json} |  0
 ...son => repositories_617210_issues-15.json} |  0
 ...son => repositories_617210_issues-16.json} |  0
 ...son => repositories_617210_issues-17.json} |  0
 ...son => repositories_617210_issues-18.json} |  0
 ...son => repositories_617210_issues-19.json} |  0
 ...json => repositories_617210_issues-5.json} |  0
 ...json => repositories_617210_issues-6.json} |  0
 ...json => repositories_617210_issues-7.json} |  0
 ...json => repositories_617210_issues-8.json} |  0
 ...json => repositories_617210_issues-9.json} |  0
 ...760-bb92-070e61f5a475.json => user-1.json} |  0
 .../mappings/orgs_github-api-2-baecb5.json    | 48 -------------
 .../mappings/orgs_github-api-2.json           | 48 +++++++++++++
 .../repos_github-api_github-api-3-891820.json | 48 -------------
 .../repos_github-api_github-api-3.json        | 48 +++++++++++++
 ...github-api_github-api_issues-4-a70d05.json | 48 -------------
 .../repos_github-api_github-api_issues-4.json | 48 +++++++++++++
 .../repositories_617210_issues-10-5a770b.json | 48 -------------
 .../repositories_617210_issues-10.json        | 48 +++++++++++++
 .../repositories_617210_issues-11-e04b88.json | 48 -------------
 .../repositories_617210_issues-11.json        | 48 +++++++++++++
 .../repositories_617210_issues-12-fe625e.json | 48 -------------
 .../repositories_617210_issues-12.json        | 48 +++++++++++++
 .../repositories_617210_issues-13-ab2693.json | 48 -------------
 .../repositories_617210_issues-13.json        | 48 +++++++++++++
 .../repositories_617210_issues-14-9486f6.json | 48 -------------
 .../repositories_617210_issues-14.json        | 48 +++++++++++++
 .../repositories_617210_issues-15-c9e769.json | 48 -------------
 .../repositories_617210_issues-15.json        | 48 +++++++++++++
 .../repositories_617210_issues-16-46f0ca.json | 48 -------------
 .../repositories_617210_issues-16.json        | 48 +++++++++++++
 .../repositories_617210_issues-17-b2fa4e.json | 48 -------------
 .../repositories_617210_issues-17.json        | 48 +++++++++++++
 .../repositories_617210_issues-18-7d74dc.json | 48 -------------
 .../repositories_617210_issues-18.json        | 48 +++++++++++++
 .../repositories_617210_issues-19-e22232.json | 48 -------------
 .../repositories_617210_issues-19.json        | 48 +++++++++++++
 .../repositories_617210_issues-5-d2dadb.json  | 48 -------------
 .../repositories_617210_issues-5.json         | 48 +++++++++++++
 .../repositories_617210_issues-6-63d2db.json  | 48 -------------
 .../repositories_617210_issues-6.json         | 48 +++++++++++++
 .../repositories_617210_issues-7-e084b8.json  | 48 -------------
 .../repositories_617210_issues-7.json         | 48 +++++++++++++
 .../repositories_617210_issues-8-c66e22.json  | 48 -------------
 .../repositories_617210_issues-8.json         | 48 +++++++++++++
 .../repositories_617210_issues-9-ddbca5.json  | 48 -------------
 .../repositories_617210_issues-9.json         | 48 +++++++++++++
 .../testGetIssues/mappings/user-1-7741e4.json | 48 -------------
 .../testGetIssues/mappings/user-1.json        | 48 +++++++++++++
 ...c54-b6e4-529dd1bfb2ef.json => user-1.json} |  0
 ...85-0828197b9350.json => user_repos-3.json} |  0
 ...ee733b018.json => users_bitwiseman-2.json} |  0
 .../testGetMyself/mappings/user-1-f80e1f.json | 48 -------------
 .../testGetMyself/mappings/user-1.json        | 48 +++++++++++++
 .../mappings/user_repos-3-5f89dd.json         | 48 -------------
 .../testGetMyself/mappings/user_repos-3.json  | 48 +++++++++++++
 .../mappings/users_bitwiseman-2-f759e6.json   | 48 -------------
 .../mappings/users_bitwiseman-2.json          | 48 +++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ...b-api-test-org_testgetteamsforrepo-3.json} |  0
 ...test-org_testgetteamsforrepo_teams-4.json} |  0
 ...46b-9cf6-8820491e366b.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-e1b27b.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...test-org_testgetteamsforrepo-3-cf3c49.json | 48 -------------
 ...ub-api-test-org_testgetteamsforrepo-3.json | 48 +++++++++++++
 ...rg_testgetteamsforrepo_teams-4-1dd41f.json | 47 ------------
 ...-test-org_testgetteamsforrepo_teams-4.json | 47 ++++++++++++
 .../mappings/user-1-692ed5.json               | 48 -------------
 .../testGetTeamsForRepo/mappings/user-1.json  | 48 +++++++++++++
 ...hive_buildhive_issues_26_comments-54.json} |  0
 ...ion_foundation_issues_13_comments-16.json} |  0
 ...ion_foundation_issues_18_comments-17.json} |  0
 ...nternal-staging_issues_4_comments-32.json} |  0
 ...port-analytics_issues_40_comments-25.json} |  0
 ...-datadog-agent_issues_81_comments-38.json} |  0
 ...-ee4j_jaxb-ri_issues_103_comments-12.json} |  0
 ...pi_github-api_issues_178_comments-39.json} |  0
 ...pi_github-api_issues_416_comments-11.json} |  0
 ...api_github-api_issues_445_comments-9.json} |  0
 ...avaee_jaxb-v2_issues_103_comments-28.json} |  0
 ...-scm-issue-link_issues_1_comments-29.json} |  0
 ...bertura-plugin_issues_26_comments-21.json} |  0
 ..._junit-plugin_issues_108_comments-27.json} |  0
 ...project-plugin_issues_11_comments-51.json} |  0
 ...i_maven-plugin_issues_86_comments-46.json} |  0
 ...nsci_packaging_issues_57_comments-41.json} |  0
 ...llocator-plugin_issues_6_comments-49.json} |  0
 ...-runtime-plugin_issues_6_comments-31.json} |  0
 ...ersion-plugin_issues_229_comments-10.json} |  0
 ...c-steps-plugin_issues_80_comments-24.json} |  0
 ...ic-steps-plugin_issues_97_comments-7.json} |  0
 ...access-modifier_issues_18_comments-4.json} |  0
 ..._kohsuke_akuma_issues_12_comments-45.json} |  0
 ...ohsuke_args4j_issues_138_comments-36.json} |  0
 ...ohsuke_args4j_issues_151_comments-37.json} |  0
 ...ohsuke_args4j_issues_170_comments-13.json} |  0
 ..._kohsuke_com4j_issues_58_comments-43.json} |  0
 ...otation-indexer_issues_1_comments-47.json} |  0
 ...-leak-detector_issues_48_comments-14.json} |  0
 ...hsuke_j-interop_issues_3_comments-48.json} |  0
 ...hsuke_libpam4j_issues_12_comments-30.json} |  0
 ...hsuke_localizer_issues_7_comments-15.json} |  0
 ...ohsuke_mimepull_issues_2_comments-40.json} |  0
 ...s_kohsuke_winp_issues_64_comments-23.json} |  0
 ...kohsuke_winsw_issues_199_comments-35.json} |  0
 ...kohsuke_winsw_issues_288_comments-22.json} |  0
 ..._kohsuke_winsw_issues_348_comments-8.json} |  0
 ..._kohsuke_winsw_issues_401_comments-5.json} |  0
 ..._animal-sniffer_issues_9_comments-50.json} |  0
 ...acle_opengrok_issues_966_comments-44.json} |  0
 ...elabs_forcepad_issues_25_comments-53.json} |  0
 ...uppet-jenkins_issues_110_comments-52.json} |  0
 ...ee3982bfb8df.json => search_issues-2.json} |  0
 ...0529b04bb1c3.json => search_issues-3.json} |  0
 ...5d9ef504fc2.json => search_issues-34.json} |  0
 ...39f-a3f7-db38f3d15881.json => user-1.json} |  0
 ...uildhive_issues_26_comments-54-7cd879.json | 47 ------------
 ...dhive_buildhive_issues_26_comments-54.json | 47 ++++++++++++
 ...undation_issues_13_comments-16-5dd3d8.json | 47 ------------
 ...tion_foundation_issues_13_comments-16.json | 47 ++++++++++++
 ...undation_issues_18_comments-17-ab6d71.json | 47 ------------
 ...tion_foundation_issues_18_comments-17.json | 47 ++++++++++++
 ...l-staging_issues_4_comments-32-70b206.json | 47 ------------
 ...internal-staging_issues_4_comments-32.json | 47 ++++++++++++
 ...nalytics_issues_40_comments-25-392bf1.json | 47 ------------
 ...pport-analytics_issues_40_comments-25.json | 47 ++++++++++++
 ...og-agent_issues_81_comments-38-2bcf11.json | 47 ------------
 ...t-datadog-agent_issues_81_comments-38.json | 47 ++++++++++++
 ...jaxb-ri_issues_103_comments-12-279abe.json | 47 ------------
 ...e-ee4j_jaxb-ri_issues_103_comments-12.json | 47 ++++++++++++
 ...hub-api_issues_178_comments-39-f84aa3.json | 47 ------------
 ...api_github-api_issues_178_comments-39.json | 47 ++++++++++++
 ...hub-api_issues_416_comments-11-5957b8.json | 47 ------------
 ...api_github-api_issues_416_comments-11.json | 47 ++++++++++++
 ...thub-api_issues_445_comments-9-4a0cca.json | 47 ------------
 ...-api_github-api_issues_445_comments-9.json | 47 ++++++++++++
 ...jaxb-v2_issues_103_comments-28-749986.json | 47 ------------
 ...javaee_jaxb-v2_issues_103_comments-28.json | 47 ++++++++++++
 ...ssue-link_issues_1_comments-29-0dd1dc.json | 47 ------------
 ...t-scm-issue-link_issues_1_comments-29.json | 47 ++++++++++++
 ...entials-plugin_issues_38_comments-33.json} |  0
 ...a-plugin_issues_26_comments-21-9937db.json | 47 ------------
 ...obertura-plugin_issues_26_comments-21.json | 47 ++++++++++++
 ...-plugin_issues_108_comments-27-8b073d.json | 47 ------------
 ...i_junit-plugin_issues_108_comments-27.json | 47 ++++++++++++
 ...t-plugin_issues_11_comments-51-bc1b75.json | 47 ------------
 ...-project-plugin_issues_11_comments-51.json | 47 ++++++++++++
 ...n-plugin_issues_86_comments-46-8df64f.json | 47 ------------
 ...ci_maven-plugin_issues_86_comments-46.json | 47 ++++++++++++
 ...ackaging_issues_57_comments-41-77b9e5.json | 47 ------------
 ...insci_packaging_issues_57_comments-41.json | 47 ++++++++++++
 ...or-plugin_issues_6_comments-49-d346fa.json | 47 ------------
 ...allocator-plugin_issues_6_comments-49.json | 47 ++++++++++++
 ...me-plugin_issues_6_comments-31-b19ff4.json | 47 ------------
 ...y-runtime-plugin_issues_6_comments-31.json | 47 ++++++++++++
 ...-plugin_issues_229_comments-10-bdd8d8.json | 47 ------------
 ...version-plugin_issues_229_comments-10.json | 47 ++++++++++++
 ...s-plugin_issues_80_comments-24-5d72e1.json | 47 ------------
 ...ic-steps-plugin_issues_80_comments-24.json | 47 ++++++++++++
 ...ps-plugin_issues_97_comments-7-64c20a.json | 47 ------------
 ...sic-steps-plugin_issues_97_comments-7.json | 47 ++++++++++++
 ...bal-lib-plugin_issues_76_comments-19.json} |  0
 ...-modifier_issues_18_comments-4-537dcc.json | 47 ------------
 ..._access-modifier_issues_18_comments-4.json | 47 ++++++++++++
 ...ke_akuma_issues_12_comments-45-ff723c.json | 47 ------------
 ...s_kohsuke_akuma_issues_12_comments-45.json | 47 ++++++++++++
 ..._args4j_issues_138_comments-36-5875b8.json | 47 ------------
 ...kohsuke_args4j_issues_138_comments-36.json | 47 ++++++++++++
 ..._args4j_issues_151_comments-37-e2c50d.json | 47 ------------
 ...kohsuke_args4j_issues_151_comments-37.json | 47 ++++++++++++
 ...ohsuke_args4j_issues_163_comments-26.json} |  0
 ..._args4j_issues_170_comments-13-7037b3.json | 47 ------------
 ...kohsuke_args4j_issues_170_comments-13.json | 47 ++++++++++++
 ...ke_com4j_issues_58_comments-43-a8438c.json | 47 ------------
 ...s_kohsuke_com4j_issues_58_comments-43.json | 47 ++++++++++++
 ...n-indexer_issues_1_comments-47-05248c.json | 47 ------------
 ...notation-indexer_issues_1_comments-47.json | 47 ++++++++++++
 ...detector_issues_48_comments-14-8e7dee.json | 47 ------------
 ...e-leak-detector_issues_48_comments-14.json | 47 ++++++++++++
 ...j-interop_issues_3_comments-48-6785e2.json | 47 ------------
 ...ohsuke_j-interop_issues_3_comments-48.json | 47 ++++++++++++
 ...libpam4j_issues_12_comments-30-902180.json | 47 ------------
 ...ohsuke_libpam4j_issues_12_comments-30.json | 47 ++++++++++++
 ...hsuke_libpam4j_issues_23_comments-20.json} |  0
 ...hsuke_libpam4j_issues_24_comments-18.json} |  0
 ...localizer_issues_7_comments-15-4d459f.json | 47 ------------
 ...ohsuke_localizer_issues_7_comments-15.json | 47 ++++++++++++
 ..._mimepull_issues_2_comments-40-a09ab6.json | 47 ------------
 ...kohsuke_mimepull_issues_2_comments-40.json | 47 ++++++++++++
 ...s_kohsuke_winp_issues_40_comments-42.json} |  0
 ...uke_winp_issues_64_comments-23-ce501b.json | 47 ------------
 ...os_kohsuke_winp_issues_64_comments-23.json | 47 ++++++++++++
 ...e_winsw_issues_199_comments-35-e75ddc.json | 47 ------------
 ..._kohsuke_winsw_issues_199_comments-35.json | 47 ++++++++++++
 ...e_winsw_issues_288_comments-22-637246.json | 47 ------------
 ..._kohsuke_winsw_issues_288_comments-22.json | 47 ++++++++++++
 ...ke_winsw_issues_348_comments-8-92f2c6.json | 47 ------------
 ...s_kohsuke_winsw_issues_348_comments-8.json | 47 ++++++++++++
 ...ke_winsw_issues_401_comments-5-592b0c.json | 47 ------------
 ...s_kohsuke_winsw_issues_401_comments-5.json | 47 ++++++++++++
 ...s_kohsuke_winsw_issues_79_comments-6.json} |  0
 ...l-sniffer_issues_9_comments-50-f2e8ce.json | 47 ------------
 ...s_animal-sniffer_issues_9_comments-50.json | 47 ++++++++++++
 ...pengrok_issues_966_comments-44-598061.json | 47 ------------
 ...racle_opengrok_issues_966_comments-44.json | 47 ++++++++++++
 ...forcepad_issues_25_comments-53-aa901e.json | 47 ------------
 ...celabs_forcepad_issues_25_comments-53.json | 47 ++++++++++++
 ...jenkins_issues_110_comments-52-d9b771.json | 47 ------------
 ...puppet-jenkins_issues_110_comments-52.json | 47 ++++++++++++
 .../mappings/search_issues-2-a3ad60.json      | 47 ------------
 .../mappings/search_issues-2.json             | 47 ++++++++++++
 .../mappings/search_issues-3-e1b5c1.json      | 46 ------------
 .../mappings/search_issues-3.json             | 46 ++++++++++++
 .../mappings/search_issues-34-7e3768.json     | 44 ------------
 .../mappings/search_issues-34.json            | 44 ++++++++++++
 .../mappings/user-1-b01b82.json               | 48 -------------
 .../testIssueSearch/mappings/user-1.json      | 48 +++++++++++++
 ...703de1e.json => repos_kohsuke_test-1.json} |  0
 ...son => repos_kohsuke_test_issues_3-4.json} |  0
 ...pos_kohsuke_test_issues_3_comments-5.json} |  0
 ...son => repos_kohsuke_test_issues_4-2.json} |  0
 ...877-83d1-1617ed206128.json => user-6.json} |  0
 .../mappings/repos_kohsuke_test-1-5e9335.json | 48 -------------
 .../mappings/repos_kohsuke_test-1.json        | 48 +++++++++++++
 .../repos_kohsuke_test_issues_3-4-805b83.json | 48 -------------
 .../repos_kohsuke_test_issues_3-4.json        | 48 +++++++++++++
 ...hsuke_test_issues_3_comments-5-83d2db.json | 47 ------------
 ...epos_kohsuke_test_issues_3_comments-5.json | 47 ++++++++++++
 .../repos_kohsuke_test_issues_4-2-d90a1a.json | 48 -------------
 .../repos_kohsuke_test_issues_4-2.json        | 48 +++++++++++++
 ...pos_kohsuke_test_issues_4_comments-3.json} |  0
 .../mappings/user-6-0d50ed.json               | 48 -------------
 .../mappings/user-6.json                      | 48 +++++++++++++
 ...json => repos_kohsuke_empty-commit-3.json} |  0
 ...repos_kohsuke_empty-commit_commits-4.json} |  0
 ...572-a0c0-d6a0d416e7e7.json => user-1.json} |  0
 ...3be6c7ceb8ec.json => users_kohsuke-2.json} |  0
 .../repos_kohsuke_empty-commit-3-486d83.json  | 48 -------------
 .../repos_kohsuke_empty-commit-3.json         | 48 +++++++++++++
 ...kohsuke_empty-commit_commits-4-82c5e1.json | 48 -------------
 .../repos_kohsuke_empty-commit_commits-4.json | 48 +++++++++++++
 .../mappings/user-1-3c7e63.json               | 48 -------------
 .../testListCommits/mappings/user-1.json      | 48 +++++++++++++
 .../mappings/users_kohsuke-2-8e5007.json      | 48 -------------
 .../mappings/users_kohsuke-2.json             | 48 +++++++++++++
 ...0fa8ce0cff.json => orgs_github-api-2.json} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...repos_github-api_github-api_issues-4.json} |  0
 ...son => repositories_617210_issues-10.json} |  0
 ...son => repositories_617210_issues-11.json} |  0
 ...son => repositories_617210_issues-12.json} |  0
 ...son => repositories_617210_issues-13.json} |  0
 ...son => repositories_617210_issues-14.json} |  0
 ...son => repositories_617210_issues-15.json} |  0
 ...son => repositories_617210_issues-16.json} |  0
 ...son => repositories_617210_issues-17.json} |  0
 ...son => repositories_617210_issues-18.json} |  0
 ...son => repositories_617210_issues-19.json} |  0
 ...son => repositories_617210_issues-20.json} |  0
 ...son => repositories_617210_issues-21.json} |  0
 ...son => repositories_617210_issues-22.json} |  0
 ...son => repositories_617210_issues-23.json} |  0
 ...son => repositories_617210_issues-24.json} |  0
 ...json => repositories_617210_issues-5.json} |  0
 ...json => repositories_617210_issues-6.json} |  0
 ...json => repositories_617210_issues-7.json} |  0
 ...json => repositories_617210_issues-8.json} |  0
 ...json => repositories_617210_issues-9.json} |  0
 ...149-b69c-f69983ac4a7f.json => user-1.json} |  0
 .../mappings/orgs_github-api-2-ed7291.json    | 48 -------------
 .../mappings/orgs_github-api-2.json           | 48 +++++++++++++
 .../repos_github-api_github-api-3-fcfac2.json | 48 -------------
 .../repos_github-api_github-api-3.json        | 48 +++++++++++++
 ...github-api_github-api_issues-4-b87318.json | 48 -------------
 .../repos_github-api_github-api_issues-4.json | 48 +++++++++++++
 .../repositories_617210_issues-10-b4031b.json | 48 -------------
 .../repositories_617210_issues-10.json        | 48 +++++++++++++
 .../repositories_617210_issues-11-f8361b.json | 48 -------------
 .../repositories_617210_issues-11.json        | 48 +++++++++++++
 .../repositories_617210_issues-12-6217b7.json | 48 -------------
 .../repositories_617210_issues-12.json        | 48 +++++++++++++
 .../repositories_617210_issues-13-4cb18e.json | 48 -------------
 .../repositories_617210_issues-13.json        | 48 +++++++++++++
 .../repositories_617210_issues-14-45f995.json | 48 -------------
 .../repositories_617210_issues-14.json        | 48 +++++++++++++
 .../repositories_617210_issues-15-e299e5.json | 48 -------------
 .../repositories_617210_issues-15.json        | 48 +++++++++++++
 .../repositories_617210_issues-16-499826.json | 48 -------------
 .../repositories_617210_issues-16.json        | 48 +++++++++++++
 .../repositories_617210_issues-17-da0634.json | 48 -------------
 .../repositories_617210_issues-17.json        | 48 +++++++++++++
 .../repositories_617210_issues-18-f4a18f.json | 48 -------------
 .../repositories_617210_issues-18.json        | 48 +++++++++++++
 .../repositories_617210_issues-19-fa3775.json | 48 -------------
 .../repositories_617210_issues-19.json        | 48 +++++++++++++
 .../repositories_617210_issues-20-22bd53.json | 48 -------------
 .../repositories_617210_issues-20.json        | 48 +++++++++++++
 .../repositories_617210_issues-21-e0b920.json | 48 -------------
 .../repositories_617210_issues-21.json        | 48 +++++++++++++
 .../repositories_617210_issues-22-58ea23.json | 48 -------------
 .../repositories_617210_issues-22.json        | 48 +++++++++++++
 .../repositories_617210_issues-23-90d12d.json | 48 -------------
 .../repositories_617210_issues-23.json        | 48 +++++++++++++
 .../repositories_617210_issues-24-ccbca4.json | 48 -------------
 .../repositories_617210_issues-24.json        | 48 +++++++++++++
 .../repositories_617210_issues-5-f5091c.json  | 48 -------------
 .../repositories_617210_issues-5.json         | 48 +++++++++++++
 .../repositories_617210_issues-6-1b4ed1.json  | 48 -------------
 .../repositories_617210_issues-6.json         | 48 +++++++++++++
 .../repositories_617210_issues-7-167244.json  | 48 -------------
 .../repositories_617210_issues-7.json         | 48 +++++++++++++
 .../repositories_617210_issues-8-e38127.json  | 48 -------------
 .../repositories_617210_issues-8.json         | 48 +++++++++++++
 .../repositories_617210_issues-9-c62bb8.json  | 48 -------------
 .../repositories_617210_issues-9.json         | 48 +++++++++++++
 .../mappings/user-1-95af3f.json               | 48 -------------
 .../testListIssues/mappings/user-1.json       | 48 +++++++++++++
 ...9517a5c45.json => orgs_cloudbeers-10.json} |  0
 ...3495d1c9493.json => orgs_cloudbees-5.json} |  0
 ...e.json => orgs_cloudbees-community-9.json} |  0
 ...c8560bd60268.json => orgs_infradna-6.json} |  0
 ...json => orgs_java-schema-utilities-8.json} |  0
 ...69bfae.json => orgs_jenkins-infra-11.json} |  0
 ...d8648c60b65.json => orgs_jenkinsci-4.json} |  0
 ...809f2.json => orgs_jenkinsci-cert-13.json} |  0
 ...1aebf.json => orgs_legomatterhorn-12.json} |  0
 ...-8f53a32132ae.json => orgs_stapler-7.json} |  0
 ...7db-9d5c-00a803146d56.json => user-1.json} |  0
 ...2587a9b75e8e.json => users_kohsuke-2.json} |  0
 ...5572966.json => users_kohsuke_orgs-3.json} |  0
 .../mappings/orgs_cloudbeers-10-4936bd.json   | 48 -------------
 .../mappings/orgs_cloudbeers-10.json          | 48 +++++++++++++
 .../mappings/orgs_cloudbees-5-769fb6.json     | 48 -------------
 .../mappings/orgs_cloudbees-5.json            | 48 +++++++++++++
 .../orgs_cloudbees-community-9-cce9ba.json    | 48 -------------
 .../mappings/orgs_cloudbees-community-9.json  | 48 +++++++++++++
 .../mappings/orgs_infradna-6-af7edd.json      | 48 -------------
 .../mappings/orgs_infradna-6.json             | 48 +++++++++++++
 .../orgs_java-schema-utilities-8-89ed2c.json  | 48 -------------
 .../orgs_java-schema-utilities-8.json         | 48 +++++++++++++
 .../orgs_jenkins-infra-11-30e7c1.json         | 48 -------------
 .../mappings/orgs_jenkins-infra-11.json       | 48 +++++++++++++
 .../mappings/orgs_jenkinsci-4-100ade.json     | 48 -------------
 .../mappings/orgs_jenkinsci-4.json            | 48 +++++++++++++
 .../orgs_jenkinsci-cert-13-0a4422.json        | 48 -------------
 .../mappings/orgs_jenkinsci-cert-13.json      | 48 +++++++++++++
 .../orgs_legomatterhorn-12-26ad87.json        | 48 -------------
 .../mappings/orgs_legomatterhorn-12.json      | 48 +++++++++++++
 .../mappings/orgs_stapler-7-e0ce27.json       | 48 -------------
 .../mappings/orgs_stapler-7.json              | 48 +++++++++++++
 .../mappings/user-1-f4bfac.json               | 48 -------------
 .../testMemberOrgs/mappings/user-1.json       | 48 +++++++++++++
 .../mappings/users_kohsuke-2-0e4039.json      | 48 -------------
 .../mappings/users_kohsuke-2.json             | 48 +++++++++++++
 .../mappings/users_kohsuke_orgs-3-e6c67f.json | 47 ------------
 .../mappings/users_kohsuke_orgs-3.json        | 47 ++++++++++++
 ...9.json => orgs_github-api-test-org-2.json} |  0
 ... repos_github-api-test-org_jenkins-3.json} |  0
 ...api-test-org_jenkins_collaborators-4.json} |  0
 ...b2e-9639-85d62c8c474a.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-f298a1.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ..._github-api-test-org_jenkins-3-e9db4f.json | 48 -------------
 .../repos_github-api-test-org_jenkins-3.json  | 48 +++++++++++++
 ...st-org_jenkins_collaborators-4-bce974.json | 47 ------------
 ...-api-test-org_jenkins_collaborators-4.json | 47 ++++++++++++
 .../mappings/user-1-4457ee.json               | 48 -------------
 .../testMembership/mappings/user-1.json       | 48 +++++++++++++
 ...99a-bfdc-302f729fe6c2.json => user-2.json} |  0
 ...2ce-162ca7bdb55f.json => user_orgs-1.json} |  0
 .../mappings/user-2-a4cacc.json               | 48 -------------
 .../testMyOrganizations/mappings/user-2.json  | 48 +++++++++++++
 .../mappings/user_orgs-1-2985ea.json          | 47 ------------
 .../mappings/user_orgs-1.json                 | 47 ++++++++++++
 ...ae9-85b5-5ab28ed9379e.json => user-1.json} |  0
 ...1e0-35803e96fe36.json => user_orgs-3.json} |  0
 ...78-367cb7c360a2.json => user_teams-2.json} |  0
 .../mappings/user-1-fd1c25.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 .../mappings/user_orgs-3-f38132.json          | 47 ------------
 .../mappings/user_orgs-3.json                 | 47 ++++++++++++
 .../mappings/user_teams-2-49ff8d.json         | 47 ------------
 .../mappings/user_teams-2.json                | 47 ++++++++++++
 ...son => organizations_107424_teams-11.json} |  0
 ...son => organizations_107424_teams-20.json} |  0
 ...son => organizations_107424_teams-23.json} |  0
 ...son => organizations_107424_teams-26.json} |  0
 ...son => organizations_235526_teams-35.json} |  0
 ...son => organizations_235526_teams-44.json} |  0
 ...son => organizations_235526_teams-47.json} |  0
 ...0247969.json => orgs_beautify-web-67.json} |  0
 ...1.json => orgs_beautify-web_teams-68.json} |  0
 ...5e5558bd39.json => orgs_cloudbees-33.json} |  0
 ...487e.json => orgs_cloudbees_teams-34.json} |  0
 ...04fb.json => orgs_cloudbees_teams-37.json} |  0
 ...d2c0.json => orgs_cloudbees_teams-39.json} |  0
 ...e21f.json => orgs_cloudbees_teams-41.json} |  0
 ...b0a5.json => orgs_cloudbees_teams-43.json} |  0
 ...affa.json => orgs_cloudbees_teams-46.json} |  0
 ...bc0c.json => orgs_cloudbees_teams-49.json} |  0
 ....json => orgs_github-api-test-org-51.json} |  0
 ...=> orgs_github-api-test-org_teams-52.json} |  0
 ...=> orgs_github-api-test-org_teams-54.json} |  0
 ...8d4691f6.json => orgs_jenkins-inc-30.json} |  0
 ...cd.json => orgs_jenkins-inc_teams-31.json} |  0
 ...80c7f4.json => orgs_jenkins-infra-56.json} |  0
 ....json => orgs_jenkins-infra_teams-57.json} |  0
 ....json => orgs_jenkins-infra_teams-59.json} |  0
 ....json => orgs_jenkins-infra_teams-61.json} |  0
 ....json => orgs_jenkins-infra_teams-63.json} |  0
 ....json => orgs_jenkins-infra_teams-65.json} |  0
 ...f3d6f249294.json => orgs_jenkinsci-3.json} |  0
 ...5775.json => orgs_jenkinsci_teams-10.json} |  0
 ...03ec.json => orgs_jenkinsci_teams-13.json} |  0
 ...68c7.json => orgs_jenkinsci_teams-15.json} |  0
 ...c45d.json => orgs_jenkinsci_teams-17.json} |  0
 ...1122.json => orgs_jenkinsci_teams-19.json} |  0
 ...68b4.json => orgs_jenkinsci_teams-22.json} |  0
 ...2d3d.json => orgs_jenkinsci_teams-25.json} |  0
 ...83f4.json => orgs_jenkinsci_teams-28.json} |  0
 ...ecf08.json => orgs_jenkinsci_teams-4.json} |  0
 ...445fe.json => orgs_jenkinsci_teams-6.json} |  0
 ...d4e97.json => orgs_jenkinsci_teams-8.json} |  0
 ...135-bd51-f0f96e57d45b.json => user-1.json} |  0
 ...44-739b7ee976b9.json => user_teams-2.json} |  0
 .../organizations_107424_teams-11-bed0fc.json | 51 -------------
 .../organizations_107424_teams-11.json        | 51 +++++++++++++
 .../organizations_107424_teams-20-2fdc05.json | 51 -------------
 .../organizations_107424_teams-20.json        | 51 +++++++++++++
 .../organizations_107424_teams-23-864a80.json | 51 -------------
 .../organizations_107424_teams-23.json        | 51 +++++++++++++
 .../organizations_107424_teams-26-881e08.json | 50 -------------
 .../organizations_107424_teams-26.json        | 50 +++++++++++++
 .../organizations_235526_teams-35-8591cc.json | 51 -------------
 .../organizations_235526_teams-35.json        | 51 +++++++++++++
 .../organizations_235526_teams-44-3945b4.json | 51 -------------
 .../organizations_235526_teams-44.json        | 51 +++++++++++++
 .../organizations_235526_teams-47-bed317.json | 50 -------------
 .../organizations_235526_teams-47.json        | 50 +++++++++++++
 .../mappings/orgs_beautify-web-67-62298d.json | 48 -------------
 .../mappings/orgs_beautify-web-67.json        | 48 +++++++++++++
 .../orgs_beautify-web_teams-68-586844.json    | 47 ------------
 .../mappings/orgs_beautify-web_teams-68.json  | 47 ++++++++++++
 .../mappings/orgs_cloudbees-33-ce8716.json    | 48 -------------
 .../mappings/orgs_cloudbees-33.json           | 48 +++++++++++++
 .../orgs_cloudbees_teams-34-57f5eb.json       | 51 -------------
 .../mappings/orgs_cloudbees_teams-34.json     | 51 +++++++++++++
 .../orgs_cloudbees_teams-37-632605.json       | 51 -------------
 .../mappings/orgs_cloudbees_teams-37.json     | 51 +++++++++++++
 .../orgs_cloudbees_teams-39-fbf640.json       | 51 -------------
 .../mappings/orgs_cloudbees_teams-39.json     | 51 +++++++++++++
 .../orgs_cloudbees_teams-41-c3bba3.json       | 51 -------------
 .../mappings/orgs_cloudbees_teams-41.json     | 51 +++++++++++++
 .../orgs_cloudbees_teams-43-1d3fc4.json       | 51 -------------
 .../mappings/orgs_cloudbees_teams-43.json     | 51 +++++++++++++
 .../orgs_cloudbees_teams-46-4d6d15.json       | 51 -------------
 .../mappings/orgs_cloudbees_teams-46.json     | 51 +++++++++++++
 .../orgs_cloudbees_teams-49-35c476.json       | 50 -------------
 .../mappings/orgs_cloudbees_teams-49.json     | 50 +++++++++++++
 .../orgs_github-api-test-org-51-a52998.json   | 48 -------------
 .../mappings/orgs_github-api-test-org-51.json | 48 +++++++++++++
 ...s_github-api-test-org_teams-52-c4dada.json | 50 -------------
 .../orgs_github-api-test-org_teams-52.json    | 50 +++++++++++++
 ...s_github-api-test-org_teams-54-4eeff3.json | 49 -------------
 .../orgs_github-api-test-org_teams-54.json    | 49 +++++++++++++
 .../mappings/orgs_jenkins-inc-30-e0b11b.json  | 48 -------------
 .../mappings/orgs_jenkins-inc-30.json         | 48 +++++++++++++
 .../orgs_jenkins-inc_teams-31-383d61.json     | 47 ------------
 .../mappings/orgs_jenkins-inc_teams-31.json   | 47 ++++++++++++
 .../orgs_jenkins-infra-56-b7c4f4.json         | 48 -------------
 .../mappings/orgs_jenkins-infra-56.json       | 48 +++++++++++++
 .../orgs_jenkins-infra_teams-57-196db4.json   | 50 -------------
 .../mappings/orgs_jenkins-infra_teams-57.json | 50 +++++++++++++
 .../orgs_jenkins-infra_teams-59-b6bb78.json   | 50 -------------
 .../mappings/orgs_jenkins-infra_teams-59.json | 50 +++++++++++++
 .../orgs_jenkins-infra_teams-61-a7f22b.json   | 50 -------------
 .../mappings/orgs_jenkins-infra_teams-61.json | 50 +++++++++++++
 .../orgs_jenkins-infra_teams-63-b5053d.json   | 50 -------------
 .../mappings/orgs_jenkins-infra_teams-63.json | 50 +++++++++++++
 .../orgs_jenkins-infra_teams-65-f8bd81.json   | 49 -------------
 .../mappings/orgs_jenkins-infra_teams-65.json | 49 +++++++++++++
 .../mappings/orgs_jenkinsci-3-eac3f0.json     | 48 -------------
 .../mappings/orgs_jenkinsci-3.json            | 48 +++++++++++++
 .../orgs_jenkinsci_teams-10-bedcae.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-10.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-13-acf98b.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-13.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-15-0aaf05.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-15.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-17-90bfe4.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-17.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-19-4922cd.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-19.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-22-4b9e60.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-22.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-25-51a481.json       | 51 -------------
 .../mappings/orgs_jenkinsci_teams-25.json     | 51 +++++++++++++
 .../orgs_jenkinsci_teams-28-a9e651.json       | 50 -------------
 .../mappings/orgs_jenkinsci_teams-28.json     | 50 +++++++++++++
 .../orgs_jenkinsci_teams-4-421fa9.json        | 51 -------------
 .../mappings/orgs_jenkinsci_teams-4.json      | 51 +++++++++++++
 .../orgs_jenkinsci_teams-6-7e7d35.json        | 51 -------------
 .../mappings/orgs_jenkinsci_teams-6.json      | 51 +++++++++++++
 .../orgs_jenkinsci_teams-8-2832b4.json        | 51 -------------
 .../mappings/orgs_jenkinsci_teams-8.json      | 51 +++++++++++++
 ... teams_1450069_members_bitwiseman-50.json} |  0
 ... teams_1809126_members_bitwiseman-18.json} |  0
 ... teams_1882929_members_bitwiseman-66.json} |  0
 ... teams_1941826_members_bitwiseman-32.json} |  0
 ... teams_1986920_members_bitwiseman-29.json} |  0
 ... teams_2070581_members_bitwiseman-42.json} |  0
 ... teams_2185547_members_bitwiseman-14.json} |  0
 ... teams_2188150_members_bitwiseman-58.json} |  0
 ... teams_2278154_members_bitwiseman-60.json} |  0
 ...> teams_2300722_members_bitwiseman-7.json} |  0
 ... teams_2384898_members_bitwiseman-40.json} |  0
 ... teams_2384906_members_bitwiseman-36.json} |  0
 ... teams_2478842_members_bitwiseman-16.json} |  0
 ... teams_2510135_members_bitwiseman-62.json} |  0
 ... teams_2658933_members_bitwiseman-64.json} |  0
 ... teams_2832516_members_bitwiseman-27.json} |  0
 ... teams_2832517_members_bitwiseman-21.json} |  0
 ... teams_2915408_members_bitwiseman-45.json} |  0
 ... teams_2934265_members_bitwiseman-24.json} |  0
 ... teams_3023453_members_bitwiseman-12.json} |  0
 ... teams_3136781_members_bitwiseman-48.json} |  0
 ... teams_3451996_members_bitwiseman-55.json} |  0
 ...=> teams_496711_members_bitwiseman-9.json} |  0
 ...> teams_663296_members_bitwiseman-69.json} |  0
 ...=> teams_711073_members_bitwiseman-5.json} |  0
 ...> teams_820404_members_bitwiseman-53.json} |  0
 ...> teams_879403_members_bitwiseman-38.json} |  0
 .../mappings/user-1-9a7933.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 .../mappings/user_teams-2-d60daf.json         | 47 ------------
 .../mappings/user_teams-2.json                | 47 ++++++++++++
 ...8.json => orgs_github-api-test-org-3.json} |  0
 ...> repos_github-api-test-org_rubywm-5.json} |  0
 ...d78a7.json => repos_kohsuke_rubywm-2.json} |  0
 ...json => repos_kohsuke_rubywm_forks-4.json} |  0
 ...e85-9ed4-0ed31ebc9d63.json => user-1.json} |  0
 .../orgs_github-api-test-org-3-183987.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-3.json  | 48 +++++++++++++
 ...s_github-api-test-org_rubywm-5-5b2f01.json | 48 -------------
 .../repos_github-api-test-org_rubywm-5.json   | 48 +++++++++++++
 .../repos_kohsuke_rubywm-2-7f6b9e.json        | 48 -------------
 .../mappings/repos_kohsuke_rubywm-2.json      | 48 +++++++++++++
 .../repos_kohsuke_rubywm_forks-4-044af3.json  | 48 -------------
 .../repos_kohsuke_rubywm_forks-4.json         | 48 +++++++++++++
 .../testOrgFork/mappings/user-1-07a004.json   | 48 -------------
 .../wiremock/testOrgFork/mappings/user-1.json | 48 +++++++++++++
 ...son => organizations_107424_repos-10.json} |  0
 ...son => organizations_107424_repos-11.json} |  0
 ...son => organizations_107424_repos-12.json} |  0
 ...son => organizations_107424_repos-13.json} |  0
 ...son => organizations_107424_repos-14.json} |  0
 ...son => organizations_107424_repos-15.json} |  0
 ...son => organizations_107424_repos-16.json} |  0
 ...son => organizations_107424_repos-17.json} |  0
 ...son => organizations_107424_repos-18.json} |  0
 ...son => organizations_107424_repos-19.json} |  0
 ...son => organizations_107424_repos-20.json} |  0
 ...son => organizations_107424_repos-21.json} |  0
 ...son => organizations_107424_repos-22.json} |  0
 ...son => organizations_107424_repos-23.json} |  0
 ...son => organizations_107424_repos-24.json} |  0
 ...son => organizations_107424_repos-25.json} |  0
 ...json => organizations_107424_repos-4.json} |  0
 ...json => organizations_107424_repos-5.json} |  0
 ...json => organizations_107424_repos-6.json} |  0
 ...json => organizations_107424_repos-7.json} |  0
 ...json => organizations_107424_repos-8.json} |  0
 ...json => organizations_107424_repos-9.json} |  0
 ...084568695a0.json => orgs_jenkinsci-2.json} |  0
 ...8402c.json => orgs_jenkinsci_repos-3.json} |  0
 ...f8d-afb0-8c5fc9294507.json => user-1.json} |  0
 .../organizations_107424_repos-10-13ae5b.json | 48 -------------
 .../organizations_107424_repos-10.json        | 48 +++++++++++++
 .../organizations_107424_repos-11-f533dd.json | 48 -------------
 .../organizations_107424_repos-11.json        | 48 +++++++++++++
 .../organizations_107424_repos-12-df03bd.json | 48 -------------
 .../organizations_107424_repos-12.json        | 48 +++++++++++++
 .../organizations_107424_repos-13-26bad5.json | 48 -------------
 .../organizations_107424_repos-13.json        | 48 +++++++++++++
 .../organizations_107424_repos-14-8315bb.json | 48 -------------
 .../organizations_107424_repos-14.json        | 48 +++++++++++++
 .../organizations_107424_repos-15-ecf517.json | 48 -------------
 .../organizations_107424_repos-15.json        | 48 +++++++++++++
 .../organizations_107424_repos-16-45dd04.json | 48 -------------
 .../organizations_107424_repos-16.json        | 48 +++++++++++++
 .../organizations_107424_repos-17-a73c5a.json | 48 -------------
 .../organizations_107424_repos-17.json        | 48 +++++++++++++
 .../organizations_107424_repos-18-e66682.json | 48 -------------
 .../organizations_107424_repos-18.json        | 48 +++++++++++++
 .../organizations_107424_repos-19-0e04a7.json | 48 -------------
 .../organizations_107424_repos-19.json        | 48 +++++++++++++
 .../organizations_107424_repos-20-5cb3f8.json | 48 -------------
 .../organizations_107424_repos-20.json        | 48 +++++++++++++
 .../organizations_107424_repos-21-626ca8.json | 48 -------------
 .../organizations_107424_repos-21.json        | 48 +++++++++++++
 .../organizations_107424_repos-22-e0e43c.json | 48 -------------
 .../organizations_107424_repos-22.json        | 48 +++++++++++++
 .../organizations_107424_repos-23-6f8a70.json | 48 -------------
 .../organizations_107424_repos-23.json        | 48 +++++++++++++
 .../organizations_107424_repos-24-aec88a.json | 48 -------------
 .../organizations_107424_repos-24.json        | 48 +++++++++++++
 .../organizations_107424_repos-25-d95d3c.json | 48 -------------
 .../organizations_107424_repos-25.json        | 48 +++++++++++++
 .../organizations_107424_repos-4-471f9b.json  | 48 -------------
 .../organizations_107424_repos-4.json         | 48 +++++++++++++
 .../organizations_107424_repos-5-d68a56.json  | 48 -------------
 .../organizations_107424_repos-5.json         | 48 +++++++++++++
 .../organizations_107424_repos-6-d4de5f.json  | 48 -------------
 .../organizations_107424_repos-6.json         | 48 +++++++++++++
 .../organizations_107424_repos-7-db791f.json  | 48 -------------
 .../organizations_107424_repos-7.json         | 48 +++++++++++++
 .../organizations_107424_repos-8-49da2f.json  | 48 -------------
 .../organizations_107424_repos-8.json         | 48 +++++++++++++
 .../organizations_107424_repos-9-d4d7b2.json  | 48 -------------
 .../organizations_107424_repos-9.json         | 48 +++++++++++++
 .../mappings/orgs_jenkinsci-2-72681a.json     | 48 -------------
 .../mappings/orgs_jenkinsci-2.json            | 48 +++++++++++++
 .../orgs_jenkinsci_repos-3-75d09b.json        | 48 -------------
 .../mappings/orgs_jenkinsci_repos-3.json      | 48 +++++++++++++
 .../mappings/user-1-50e8f5.json               | 48 -------------
 .../testOrgRepositories/mappings/user-1.json  | 48 +++++++++++++
 ...7.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...f54-bd13-38ab188af938.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-4f288c.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-3-b980fc.json | 47 ------------
 .../orgs_github-api-test-org_teams-3.json     | 47 ++++++++++++
 .../mappings/user-1-d41553.json               | 48 -------------
 .../testOrgTeamByName/mappings/user-1.json    | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...api-test-org_teams_core-developers-4.json} |  0
 ...bce-b8bc-69aa2b88374b.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-805bfc.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-3-44dbf3.json | 47 ------------
 .../orgs_github-api-test-org_teams-3.json     | 47 ++++++++++++
 ...st-org_teams_core-developers-4-b7236b.json | 46 ------------
 ...-api-test-org_teams_core-developers-4.json | 46 ++++++++++++
 .../mappings/user-1-04565f.json               | 48 -------------
 .../testOrgTeamBySlug/mappings/user-1.json    | 48 +++++++++++++
 ...e.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...802-a5e2-8b948612ec57.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-4a4f8e.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-3-625f65.json | 47 ------------
 .../orgs_github-api-test-org_teams-3.json     | 47 ++++++++++++
 .../testOrgTeams/mappings/user-1-fc66c1.json  | 48 -------------
 .../testOrgTeams/mappings/user-1.json         | 48 +++++++++++++
 ...2.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ... repos_github-api-test-org_jenkins-4.json} |  0
 ...227-889d-462ad0dbd34b.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-bbf24d.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-3-7e66f9.json | 47 ------------
 .../orgs_github-api-test-org_teams-3.json     | 47 ++++++++++++
 ..._github-api-test-org_jenkins-4-1d18fc.json | 48 -------------
 .../repos_github-api-test-org_jenkins-4.json  | 48 +++++++++++++
 .../mappings/user-1-0a855c.json               | 48 -------------
 .../testOrganization/mappings/user-1.json     | 48 +++++++++++++
 ...1e-f39465b89bb8.json => rate_limit-1.json} |  0
 ...70e-bd8d-0665521673e3.json => user-2.json} |  0
 .../mappings/rate_limit-1-195911.json         | 43 -----------
 .../testRateLimit/mappings/rate_limit-1.json  | 43 +++++++++++
 .../testRateLimit/mappings/user-2-50a73d.json | 48 -------------
 .../testRateLimit/mappings/user-2.json        | 48 +++++++++++++
 ...os_github-api-test-org_test-readme-2.json} |  0
 ...ub-api-test-org_test-readme_readme-3.json} |  0
 ...d9c-a356-cb1cba2237ac.json => user-1.json} |  0
 ...hub-api-test-org_test-readme-2-bb7ded.json | 48 -------------
 ...pos_github-api-test-org_test-readme-2.json | 48 +++++++++++++
 ...-test-org_test-readme_readme-3-7d02ee.json | 48 -------------
 ...hub-api-test-org_test-readme_readme-3.json | 48 +++++++++++++
 .../testReadme/mappings/user-1-6da871.json    | 48 -------------
 .../wiremock/testReadme/mappings/user-1.json  | 48 +++++++++++++
 ...06.json => repos_jenkinsci_jenkins-2.json} |  0
 ...nsci_jenkins_git_refs_heads_master-3.json} |  0
 ...3e0-ab38-bdf00d276fe0.json => user-1.json} |  0
 .../repos_jenkinsci_jenkins-2-284579.json     | 48 -------------
 .../mappings/repos_jenkinsci_jenkins-2.json   | 48 +++++++++++++
 ...enkins_git_refs_heads_master-3-257aa3.json | 49 -------------
 ...insci_jenkins_git_refs_heads_master-3.json | 49 +++++++++++++
 .../testRef/mappings/user-1-045bae.json       | 48 -------------
 .../wiremock/testRef/mappings/user-1.json     | 48 +++++++++++++
 ...658-a037-d113f99314af.json => user-6.json} |  0
 ...81-03bb7cd5d2d1.json => user_repos-1.json} |  0
 ..._bitwiseman_github-api-test-rename-2.json} |  0
 ..._bitwiseman_github-api-test-rename-3.json} |  0
 ..._bitwiseman_github-api-test-rename-4.json} |  0
 ..._bitwiseman_github-api-test-rename-5.json} |  0
 ...bitwiseman_github-api-test-rename2-7.json} |  0
 ...bitwiseman_github-api-test-rename2-8.json} |  0
 .../testRepoCRUD/mappings/user-6-3068cd.json  | 48 -------------
 .../testRepoCRUD/mappings/user-6.json         | 48 +++++++++++++
 .../mappings/user_repos-1-ead413.json         | 55 --------------
 .../testRepoCRUD/mappings/user_repos-1.json   | 55 ++++++++++++++
 ...os_github-api-test-org_test-labels-2.json} |  0
 ...ub-api-test-org_test-labels_labels-3.json} |  0
 .../testRepoLabel/__files/user-1.json         | 45 ++++++++++++
 ...-a78a0f34-4527-48ba-88f8-16c319430bc6.json | 45 ------------
 ...hub-api-test-org_test-labels-2-47685e.json | 46 ------------
 ...pos_github-api-test-org_test-labels-2.json | 46 ++++++++++++
 ...test-org_test-labels_labels-15-6c2ac6.json | 53 --------------
 ...ub-api-test-org_test-labels_labels-15.json | 53 ++++++++++++++
 ...test-org_test-labels_labels-18-b1cf4b.json | 53 --------------
 ...ub-api-test-org_test-labels_labels-18.json | 53 ++++++++++++++
 ...-test-org_test-labels_labels-3-28c58b.json | 45 ------------
 ...hub-api-test-org_test-labels_labels-3.json | 45 ++++++++++++
 ...-test-org_test-labels_labels-5-154147.json | 53 --------------
 ...hub-api-test-org_test-labels_labels-5.json | 53 ++++++++++++++
 ...st-labels_labels_enhancement-4-e1469d.json | 46 ------------
 ...-org_test-labels_labels_enhancement-4.json | 46 ++++++++++++
 ...org_test-labels_labels_test-10-cace49.json | 52 --------------
 ...i-test-org_test-labels_labels_test-10.json | 52 ++++++++++++++
 ...org_test-labels_labels_test-11-e4b594.json | 49 -------------
 ...i-test-org_test-labels_labels_test-11.json | 49 +++++++++++++
 ...org_test-labels_labels_test-12-0dad57.json | 52 --------------
 ...i-test-org_test-labels_labels_test-12.json | 52 ++++++++++++++
 ...org_test-labels_labels_test-13-09f51c.json | 38 ----------
 ...i-test-org_test-labels_labels_test-13.json | 38 ++++++++++
 ...org_test-labels_labels_test-14-331784.json | 42 -----------
 ...i-test-org_test-labels_labels_test-14.json | 42 +++++++++++
 ...-org_test-labels_labels_test-6-bee660.json | 49 -------------
 ...pi-test-org_test-labels_labels_test-6.json | 49 +++++++++++++
 ...-org_test-labels_labels_test-7-528317.json | 52 --------------
 ...pi-test-org_test-labels_labels_test-7.json | 52 ++++++++++++++
 ...-org_test-labels_labels_test-8-c772a0.json | 52 --------------
 ...pi-test-org_test-labels_labels_test-8.json | 52 ++++++++++++++
 ...-org_test-labels_labels_test-9-6aef5e.json | 49 -------------
 ...pi-test-org_test-labels_labels_test-9.json | 49 +++++++++++++
 ...rg_test-labels_labels_test2-16-6ad140.json | 46 ------------
 ...-test-org_test-labels_labels_test2-16.json | 46 ++++++++++++
 ...rg_test-labels_labels_test2-17-7c5913.json | 38 ----------
 ...-test-org_test-labels_labels_test2-17.json | 38 ++++++++++
 .../testRepoLabel/mappings/user-1-a78a0f.json | 46 ------------
 .../testRepoLabel/mappings/user-1.json        | 46 ++++++++++++
 ...itwiseman_github-api-test-autoinit-2.json} |  0
 ...itwiseman_github-api-test-autoinit-3.json} |  0
 ...itwiseman_github-api-test-autoinit-4.json} |  0
 ...itwiseman_github-api-test-autoinit-7.json} |  0
 ...an_github-api-test-autoinit_readme-5.json} |  0
 ...f90-a77a-f6ff9e371db0.json => user-6.json} |  0
 ...81-118897a274af.json => user_repos-1.json} |  0
 ...man_github-api-test-autoinit-2-64af61.json | 54 --------------
 ...bitwiseman_github-api-test-autoinit-2.json | 54 ++++++++++++++
 ...man_github-api-test-autoinit-3-a1a05f.json | 54 --------------
 ...bitwiseman_github-api-test-autoinit-3.json | 54 ++++++++++++++
 ...man_github-api-test-autoinit-4-c71176.json | 54 --------------
 ...bitwiseman_github-api-test-autoinit-4.json | 54 ++++++++++++++
 ...man_github-api-test-autoinit-7-51dabc.json | 48 -------------
 ...bitwiseman_github-api-test-autoinit-7.json | 48 +++++++++++++
 ...itwiseman_github-api-test-autoinit-8.json} |  0
 ...hub-api-test-autoinit_readme-5-459f37.json | 48 -------------
 ...man_github-api-test-autoinit_readme-5.json | 48 +++++++++++++
 .../mappings/user-6-b16c3b.json               | 48 -------------
 .../mappings/user-6.json                      | 48 +++++++++++++
 .../mappings/user_repos-1-7be481.json         | 55 --------------
 .../mappings/user_repos-1.json                | 55 ++++++++++++++
 ... organizations_7544739_team_820406-7.json} |  0
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...-f035a849e3fb.json => teams_820406-8.json} |  0
 ...9f3-a544-a434298717e4.json => user-1.json} |  0
 ...izations_7544739_team_820406-7-8b1ba7.json | 46 ------------
 .../organizations_7544739_team_820406-7.json  | 46 ++++++++++++
 ...organizations_7544739_teams_820406-6.json} |  0
 ...s_github-api-test-org_teams_820406-5.json} |  0
 .../orgs_github-api-test-org-2-84aa54.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-2.json  | 46 ++++++++++++
 ...gs_github-api-test-org_teams-3-d83359.json | 45 ------------
 .../orgs_github-api-test-org_teams-3.json     | 45 ++++++++++++
 ...s_github-api-test-org_teams_820406-4.json} |  0
 .../mappings/teams_820406-8-9302cc.json       | 49 -------------
 .../mappings/teams_820406-8.json              | 49 +++++++++++++
 .../mappings/user-1-59e094.json               | 46 ------------
 .../testShouldFetchTeam/mappings/user-1.json  | 46 ++++++++++++
 ... organizations_7544739_team_820406-4.json} |  0
 ...3.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...afe-85d3-5413eb288548.json => user-1.json} |  0
 ...izations_7544739_team_820406-4-ba773c.json | 46 ------------
 .../organizations_7544739_team_820406-4.json  | 46 ++++++++++++
 .../orgs_github-api-test-org-2-1e6cca.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-2.json  | 46 ++++++++++++
 ...gs_github-api-test-org_teams-3-e2aa00.json | 45 ------------
 .../orgs_github-api-test-org_teams-3.json     | 45 ++++++++++++
 .../mappings/user-1-09eec5.json               | 46 ------------
 .../mappings/user-1.json                      | 46 ++++++++++++
 ...son => repos_bitwiseman_github-api-2.json} |  0
 ..._bitwiseman_github-api_subscribers-3.json} |  0
 ...27c-a70e-adaad303b0b4.json => user-1.json} |  0
 ...05981b.json => user_1958953_repos-10.json} |  0
 ...231b603.json => user_1958953_repos-6.json} |  0
 ...5a49011.json => user_1958953_repos-7.json} |  0
 ...e61d385.json => user_1958953_repos-8.json} |  0
 ...bf79e20.json => user_1958953_repos-9.json} |  0
 ...71b040233.json => users_bitwiseman-4.json} |  0
 ...069.json => users_bitwiseman_repos-5.json} |  0
 .../repos_bitwiseman_github-api-2-809893.json | 48 -------------
 .../repos_bitwiseman_github-api-2.json        | 48 +++++++++++++
 ...seman_github-api_subscribers-3-8cec42.json | 47 ------------
 ...s_bitwiseman_github-api_subscribers-3.json | 47 ++++++++++++
 .../mappings/user-1-9344f7.json               | 48 -------------
 .../testSubscribers/mappings/user-1.json      | 48 +++++++++++++
 .../user_1958953_repos-10-bd9bd7.json         | 48 -------------
 .../mappings/user_1958953_repos-10.json       | 48 +++++++++++++
 .../mappings/user_1958953_repos-6-36527c.json | 48 -------------
 .../mappings/user_1958953_repos-6.json        | 48 +++++++++++++
 .../mappings/user_1958953_repos-7-923eca.json | 48 -------------
 .../mappings/user_1958953_repos-7.json        | 48 +++++++++++++
 .../mappings/user_1958953_repos-8-6e87f8.json | 48 -------------
 .../mappings/user_1958953_repos-8.json        | 48 +++++++++++++
 .../mappings/user_1958953_repos-9-9bdd2b.json | 48 -------------
 .../mappings/user_1958953_repos-9.json        | 48 +++++++++++++
 .../mappings/users_bitwiseman-4-695b59.json   | 48 -------------
 .../mappings/users_bitwiseman-4.json          | 48 +++++++++++++
 .../users_bitwiseman_repos-5-2be052.json      | 48 -------------
 .../mappings/users_bitwiseman_repos-5.json    | 48 +++++++++++++
 ...8c6-98c9-5638aaff0074.json => user-1.json} |  0
 ...son => repos_github-api_github-api-2.json} |  0
 ...ub-api_github-api_git_trees_master-3.json} |  0
 .../mappings/user-1-ce7a01.json               | 48 -------------
 .../testTreesRecursive/mappings/user-1.json   | 48 +++++++++++++
 ...743-ae0c-ff932c012445.json => user-2.json} |  0
 .../mappings/user-2-813f6f.json               | 48 -------------
 .../mappings/user-2.json                      | 48 +++++++++++++
 ...ce73.json => users_bitwiseman_orgs-1.json} |  0
 ...d1c-878a-2f1c73417d2b.json => user-2.json} |  0
 ...8e9558d.json => users_kohsuke_orgs-1.json} |  0
 .../mappings/user-2-cb0c81.json               | 48 -------------
 .../mappings/user-2.json                      | 48 +++++++++++++
 .../mappings/users_kohsuke_orgs-1-7ef9c5.json | 42 -----------
 .../mappings/users_kohsuke_orgs-1.json        | 42 +++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...thub-api-test-org_github-api_hooks-4.json} |  0
 ...946-b6d9-9e2152c52f00.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-4eb608.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-6eeaa8.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...pi-test-org_github-api_hooks-4-bd2a17.json | 55 --------------
 ...ithub-api-test-org_github-api_hooks-4.json | 55 ++++++++++++++
 .../tryHook/mappings/user-1-3d7769.json       | 48 -------------
 .../wiremock/tryHook/mappings/user-1.json     | 48 +++++++++++++
 ...9d49.json => repos_stapler_stapler-2.json} |  0
 ...n => repos_stapler_stapler_commits-3.json} |  0
 ...8ec041fd8d6e7f54c8578d84a672fee9e4-8.json} |  0
 ...4e38c6d6693f7ad8b6768e4d74840d6679-9.json} |  0
 ...03c1e6188867bddddce12ff213a107d9d-10.json} |  0
 ...7d89c5172ae4f4f3167e35852b1910b59-13.json} |  0
 ...69aa3c3f80579102d00848a0083953d654-7.json} |  0
 ...d60ed4289520dcd2a395e5d77f181e1cff-6.json} |  0
 ...b749937ab239d7b7f94c2254340103f67e-4.json} |  0
 ...8068cf95d6f6ab624ce2c7f49d51f5321-11.json} |  0
 ...a365a0187e052bc81391efbd84847a1b0-12.json} |  0
 ...794e13921e7a9525a6976df900d897308f-5.json} |  0
 ...0bf-a0ef-ed960a7ad354.json => user-1.json} |  0
 .../repos_stapler_stapler-2-9019ab.json       | 48 -------------
 .../mappings/repos_stapler_stapler-2.json     | 48 +++++++++++++
 ...epos_stapler_stapler_commits-3-0d3401.json | 49 -------------
 .../repos_stapler_stapler_commits-3.json      | 49 +++++++++++++
 ...fd8d6e7f54c8578d84a672fee9e4-8-56b0ea.json | 48 -------------
 ...08ec041fd8d6e7f54c8578d84a672fee9e4-8.json | 48 +++++++++++++
 ...d6693f7ad8b6768e4d74840d6679-9-a01b5c.json | 48 -------------
 ...c4e38c6d6693f7ad8b6768e4d74840d6679-9.json | 48 +++++++++++++
 ...188867bddddce12ff213a107d9d-10-e14c2b.json | 48 -------------
 ...f03c1e6188867bddddce12ff213a107d9d-10.json | 48 +++++++++++++
 ...172ae4f4f3167e35852b1910b59-13-c380c3.json | 48 -------------
 ...d7d89c5172ae4f4f3167e35852b1910b59-13.json | 48 +++++++++++++
 ...3f80579102d00848a0083953d654-7-4c38e9.json | 48 -------------
 ...869aa3c3f80579102d00848a0083953d654-7.json | 48 +++++++++++++
 ...289520dcd2a395e5d77f181e1cff-6-670b6d.json | 48 -------------
 ...bd60ed4289520dcd2a395e5d77f181e1cff-6.json | 48 +++++++++++++
 ...7ab239d7b7f94c2254340103f67e-4-5d4638.json | 48 -------------
 ...eb749937ab239d7b7f94c2254340103f67e-4.json | 48 +++++++++++++
 ...95d6f6ab624ce2c7f49d51f5321-11-f3ed22.json | 48 -------------
 ...08068cf95d6f6ab624ce2c7f49d51f5321-11.json | 48 +++++++++++++
 ...187e052bc81391efbd84847a1b0-12-e6d566.json | 48 -------------
 ...fa365a0187e052bc81391efbd84847a1b0-12.json | 48 +++++++++++++
 ...921e7a9525a6976df900d897308f-5-8aea29.json | 48 -------------
 ...a794e13921e7a9525a6976df900d897308f-5.json | 48 +++++++++++++
 .../mappings/user-1-5ed62e.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...7830.json => repos_stapler_stapler-2.json} |  0
 ...69aa3c3f80579102d00848a0083953d654-4.json} |  0
 ...json => repos_stapler_stapler_tags-3.json} |  0
 ...9b2-b94c-a0cf8f7a0d1a.json => user-1.json} |  0
 .../repos_stapler_stapler-2-dea29c.json       | 48 -------------
 .../mappings/repos_stapler_stapler-2.json     | 48 +++++++++++++
 ...3f80579102d00848a0083953d654-4-b564ee.json | 47 ------------
 ...869aa3c3f80579102d00848a0083953d654-4.json | 47 ++++++++++++
 .../repos_stapler_stapler_tags-3-763721.json  | 49 -------------
 .../repos_stapler_stapler_tags-3.json         | 49 +++++++++++++
 .../lastStatus/mappings/user-1-bde54f.json    | 48 -------------
 .../wiremock/lastStatus/mappings/user-1.json  | 48 +++++++++++++
 ...edf8.json => repos_stapler_stapler-2.json} |  0
 ...n => repos_stapler_stapler_commits-3.json} |  0
 ...8ec041fd8d6e7f54c8578d84a672fee9e4-8.json} |  0
 ...8ec041fd8d6e7f54c8578d84a672fee9e4-9.json} |  0
 ...e38c6d6693f7ad8b6768e4d74840d6679-10.json} |  0
 ...e38c6d6693f7ad8b6768e4d74840d6679-11.json} |  0
 ...03c1e6188867bddddce12ff213a107d9d-12.json} |  0
 ...03c1e6188867bddddce12ff213a107d9d-13.json} |  0
 ...60ec120f4e2c2ed727244690b1f4d5dca-22.json} |  0
 ...60ec120f4e2c2ed727244690b1f4d5dca-23.json} |  0
 ...7d89c5172ae4f4f3167e35852b1910b59-18.json} |  0
 ...7d89c5172ae4f4f3167e35852b1910b59-19.json} |  0
 ...69aa3c3f80579102d00848a0083953d654-6.json} |  0
 ...69aa3c3f80579102d00848a0083953d654-7.json} |  0
 ...8733508cced8dcb8eb43594bcc6130b26-20.json} |  0
 ...8733508cced8dcb8eb43594bcc6130b26-21.json} |  0
 ...d60ed4289520dcd2a395e5d77f181e1cff-4.json} |  0
 ...d60ed4289520dcd2a395e5d77f181e1cff-5.json} |  0
 ...8068cf95d6f6ab624ce2c7f49d51f5321-14.json} |  0
 ...8068cf95d6f6ab624ce2c7f49d51f5321-15.json} |  0
 ...a365a0187e052bc81391efbd84847a1b0-16.json} |  0
 ...a365a0187e052bc81391efbd84847a1b0-17.json} |  0
 ...4ec-8a6a-6a9d036c91aa.json => user-1.json} |  0
 .../repos_stapler_stapler-2-342768.json       | 48 -------------
 .../mappings/repos_stapler_stapler-2.json     | 48 +++++++++++++
 ...epos_stapler_stapler_commits-3-6214fe.json | 49 -------------
 .../repos_stapler_stapler_commits-3.json      | 49 +++++++++++++
 ...fd8d6e7f54c8578d84a672fee9e4-8-4fa8c0.json | 51 -------------
 ...08ec041fd8d6e7f54c8578d84a672fee9e4-8.json | 51 +++++++++++++
 ...fd8d6e7f54c8578d84a672fee9e4-9-ad6e99.json | 50 -------------
 ...08ec041fd8d6e7f54c8578d84a672fee9e4-9.json | 50 +++++++++++++
 ...6693f7ad8b6768e4d74840d6679-10-8ac20a.json | 51 -------------
 ...4e38c6d6693f7ad8b6768e4d74840d6679-10.json | 51 +++++++++++++
 ...6693f7ad8b6768e4d74840d6679-11-c96500.json | 50 -------------
 ...4e38c6d6693f7ad8b6768e4d74840d6679-11.json | 50 +++++++++++++
 ...188867bddddce12ff213a107d9d-12-dd34f1.json | 51 -------------
 ...f03c1e6188867bddddce12ff213a107d9d-12.json | 51 +++++++++++++
 ...188867bddddce12ff213a107d9d-13-b7c821.json | 50 -------------
 ...f03c1e6188867bddddce12ff213a107d9d-13.json | 50 +++++++++++++
 ...0f4e2c2ed727244690b1f4d5dca-22-3e6d36.json | 51 -------------
 ...560ec120f4e2c2ed727244690b1f4d5dca-22.json | 51 +++++++++++++
 ...0f4e2c2ed727244690b1f4d5dca-23-8573f1.json | 50 -------------
 ...560ec120f4e2c2ed727244690b1f4d5dca-23.json | 50 +++++++++++++
 ...172ae4f4f3167e35852b1910b59-18-4c7823.json | 51 -------------
 ...d7d89c5172ae4f4f3167e35852b1910b59-18.json | 51 +++++++++++++
 ...172ae4f4f3167e35852b1910b59-19-5f3cc3.json | 50 -------------
 ...d7d89c5172ae4f4f3167e35852b1910b59-19.json | 50 +++++++++++++
 ...3f80579102d00848a0083953d654-6-d76af9.json | 51 -------------
 ...869aa3c3f80579102d00848a0083953d654-6.json | 51 +++++++++++++
 ...3f80579102d00848a0083953d654-7-a7972e.json | 50 -------------
 ...869aa3c3f80579102d00848a0083953d654-7.json | 50 +++++++++++++
 ...8cced8dcb8eb43594bcc6130b26-20-73ac5f.json | 51 -------------
 ...98733508cced8dcb8eb43594bcc6130b26-20.json | 51 +++++++++++++
 ...8cced8dcb8eb43594bcc6130b26-21-77b7d9.json | 50 -------------
 ...98733508cced8dcb8eb43594bcc6130b26-21.json | 50 +++++++++++++
 ...289520dcd2a395e5d77f181e1cff-4-45c731.json | 51 -------------
 ...bd60ed4289520dcd2a395e5d77f181e1cff-4.json | 51 +++++++++++++
 ...289520dcd2a395e5d77f181e1cff-5-1aa530.json | 50 -------------
 ...bd60ed4289520dcd2a395e5d77f181e1cff-5.json | 50 +++++++++++++
 ...95d6f6ab624ce2c7f49d51f5321-14-35c73b.json | 51 -------------
 ...08068cf95d6f6ab624ce2c7f49d51f5321-14.json | 51 +++++++++++++
 ...95d6f6ab624ce2c7f49d51f5321-15-fb5ea1.json | 50 -------------
 ...08068cf95d6f6ab624ce2c7f49d51f5321-15.json | 50 +++++++++++++
 ...187e052bc81391efbd84847a1b0-16-3621dd.json | 51 -------------
 ...fa365a0187e052bc81391efbd84847a1b0-16.json | 51 +++++++++++++
 ...187e052bc81391efbd84847a1b0-17-ca9582.json | 50 -------------
 ...fa365a0187e052bc81391efbd84847a1b0-17.json | 50 +++++++++++++
 .../listFiles/mappings/user-1-1b6473.json     | 48 -------------
 .../wiremock/listFiles/mappings/user-1.json   | 48 +++++++++++++
 ...allations-3755540-access_tokens-7W6Uy.json | 62 ++++++++--------
 ...2ee-838f-7422bb4f300d.json => user-1.json} |  0
 ...g_temp-testenablebranchprotections-2.json} |  0
 ...g_temp-testenablebranchprotections-3.json} |  0
 ...g_temp-testenablebranchprotections-4.json} |  0
 .../mappings/user-1-c38b2b.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...-org_temp-testenableprotectiononly-2.json} |  0
 ...ableprotectiononly_branches_master-3.json} |  0
 ...ableprotectiononly_branches_master-5.json} |  0
 ...iononly_branches_master_protection-4.json} |  0
 ...ea4-aad4-70d93d35dd38.json => user-1.json} |  0
 ...emp-testenableprotectiononly-2-bc3099.json | 48 -------------
 ...t-org_temp-testenableprotectiononly-2.json | 48 +++++++++++++
 ...otectiononly_branches_master-3-883282.json | 50 -------------
 ...nableprotectiononly_branches_master-3.json | 50 +++++++++++++
 ...otectiononly_branches_master-5-90ab1b.json | 49 -------------
 ...nableprotectiononly_branches_master-5.json | 49 +++++++++++++
 ...y_branches_master_protection-4-857c66.json | 54 --------------
 ...tiononly_branches_master_protection-4.json | 54 ++++++++++++++
 .../mappings/user-1-100e44.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ..._temp-testenablerequirereviewsonly-2.json} |  0
 ...requirereviewsonly_branches_master-3.json} |  0
 ...dd2-9d28-af9f67a4d9d1.json => user-1.json} |  0
 ...testenablerequirereviewsonly-2-318e0a.json | 48 -------------
 ...g_temp-testenablerequirereviewsonly-2.json | 48 +++++++++++++
 ...ereviewsonly_branches_master-3-0e0c4c.json | 47 ------------
 ...erequirereviewsonly_branches_master-3.json | 47 ++++++++++++
 ...ewsonly_branches_master_protection-4.json} |  0
 .../mappings/user-1-64a678.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...pi-test-org_temp-testsignedcommits-2.json} |  0
 ...-testsignedcommits_branches_master-3.json} |  0
 ...commits_branches_master_protection-4.json} |  0
 ...f29-8f0b-18eab8a75f14.json => user-1.json} |  0
 ...t-org_temp-testsignedcommits-2-126c7a.json | 48 -------------
 ...api-test-org_temp-testsignedcommits-2.json | 48 +++++++++++++
 ...ignedcommits_branches_master-3-7a0577.json | 47 ------------
 ...p-testsignedcommits_branches_master-3.json | 47 ++++++++++++
 ...s_branches_master_protection-4-4b8a92.json | 54 --------------
 ...dcommits_branches_master_protection-4.json | 54 ++++++++++++++
 ...ter_protection_required_signatures-5.json} |  0
 ...ter_protection_required_signatures-6.json} |  0
 ...ter_protection_required_signatures-7.json} |  0
 ...ter_protection_required_signatures-8.json} |  0
 ...ter_protection_required_signatures-9.json} |  0
 .../mappings/user-1-94ed9a.json               | 48 -------------
 .../testSignedCommits/mappings/user-1.json    | 48 +++++++++++++
 ...04c-aef4-81cb448644d9.json => user-1.json} |  0
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...tiontest_contents_testdirectory-50-6.json} |  0
 ...ectory-50_test-file-tocreate-1txt-10.json} |  0
 ...ectory-50_test-file-tocreate-1txt-11.json} |  0
 ...rectory-50_test-file-tocreate-1txt-3.json} |  0
 ...rectory-50_test-file-tocreate-1txt-4.json} |  0
 ...rectory-50_test-file-tocreate-1txt-5.json} |  0
 ...rectory-50_test-file-tocreate-1txt-7.json} |  0
 ...rectory-50_test-file-tocreate-1txt-8.json} |  0
 ...rectory-50_test-file-tocreate-1txt-9.json} |  0
 .../mappings/user-1-6cfc78.json               | 48 -------------
 .../testCRUDContent/mappings/user-1.json      | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...808-b51e-b436851e0efd.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-1d1a48.json | 48 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 48 +++++++++++++
 ..._ghcontent-ro_a-dir-with-3-entries-3.json} |  0
 .../mappings/user-1-34ca16.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...880-9f10-a0de20895d1a.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-a5c7d0.json | 48 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 48 +++++++++++++
 ..._ghcontent-ro_a-dir-with-3-entries-3.json} |  0
 .../mappings/user-1-ebccdf.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...ontents_ghcontent-ro_an-empty-file-3.json} |  0
 ...9c9-8451-d76fecb86330.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-1279fb.json | 48 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 48 +++++++++++++
 ...s_ghcontent-ro_an-empty-file-3-a4535a.json | 48 -------------
 ...contents_ghcontent-ro_an-empty-file-3.json | 48 +++++++++++++
 .../mappings/user-1-afa831.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...-test-org_ghcontentintegrationtest-3.json} |  0
 ...02d-946f-77e7511a9a27.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-788adb.json | 51 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 51 +++++++++++++
 ...org_ghcontentintegrationtest-3-54fda8.json | 50 -------------
 ...i-test-org_ghcontentintegrationtest-3.json | 50 +++++++++++++
 ...s_ghcontent-ro_a-file-with-content-4.json} |  0
 .../mappings/user-1-59f0ed.json               | 48 -------------
 .../testGetFileContent/mappings/user-1.json   | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...hub-api-test-org_temp-testmimelong-3.json} |  0
 ...-testmimelong_contents_mime-longmd-4.json} |  0
 ...1d0-ae3f-e73676b9cf83.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-558c17.json | 48 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 48 +++++++++++++
 ...i-test-org_temp-testmimelong-3-708249.json | 48 -------------
 ...thub-api-test-org_temp-testmimelong-3.json | 48 +++++++++++++
 ...imelong_contents_mime-longmd-4-fb1497.json | 54 --------------
 ...p-testmimelong_contents_mime-longmd-4.json | 54 ++++++++++++++
 .../testMIMELong/mappings/user-1-e335a3.json  | 48 -------------
 .../testMIMELong/mappings/user-1.json         | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...b-api-test-org_temp-testmimelonger-3.json} |  0
 ...estmimelonger_contents_mime-longmd-4.json} |  0
 ...fde-a559-64c0556a1aec.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-994283.json | 48 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 48 +++++++++++++
 ...test-org_temp-testmimelonger-3-916072.json | 48 -------------
 ...ub-api-test-org_temp-testmimelonger-3.json | 48 +++++++++++++
 ...elonger_contents_mime-longmd-4-1ff065.json | 54 --------------
 ...testmimelonger_contents_mime-longmd-4.json | 54 ++++++++++++++
 .../mappings/user-1-1a0b1b.json               | 48 -------------
 .../testMIMELonger/mappings/user-1.json       | 48 +++++++++++++
 ...-test-org_ghcontentintegrationtest-2.json} |  0
 ...ub-api-test-org_temp-testmimesmall-3.json} |  0
 ...estmimesmall_contents_mime-smallmd-4.json} |  0
 ...d49-8de8-aa4220400616.json => user-1.json} |  0
 ...org_ghcontentintegrationtest-2-f60bd9.json | 48 -------------
 ...i-test-org_ghcontentintegrationtest-2.json | 48 +++++++++++++
 ...-test-org_temp-testmimesmall-3-41e8e5.json | 48 -------------
 ...hub-api-test-org_temp-testmimesmall-3.json | 48 +++++++++++++
 ...esmall_contents_mime-smallmd-4-931cbb.json | 54 --------------
 ...testmimesmall_contents_mime-smallmd-4.json | 54 ++++++++++++++
 .../testMIMESmall/mappings/user-1-b9d02c.json | 48 -------------
 .../testMIMESmall/mappings/user-1.json        | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-1.json} |  0
 ...pos_github-api-test-org_github-api-2.json} |  0
 ...g_github-api_deployments_178653229-3.json} |  0
 .../orgs_github-api-test-org-1-4def93.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-1.json  | 46 ++++++++++++
 ...thub-api-test-org_github-api-2-a1a9ff.json | 46 ------------
 ...epos_github-api-test-org_github-api-2.json | 46 ++++++++++++
 ...ub-api_deployments_178653229-3-d1d9d9.json | 46 ------------
 ...rg_github-api_deployments_178653229-3.json | 46 ++++++++++++
 ...98032571c5d0.json => gists_9903708-2.json} |  0
 ...b08-9402-f1cfc2dbf0e1.json => user-1.json} |  0
 .../mappings/gists_9903708-2-c3067d.json      | 48 -------------
 .../gistFile/mappings/gists_9903708-2.json    | 48 +++++++++++++
 .../gistFile/mappings/user-1-9226d6.json      | 48 -------------
 .../wiremock/gistFile/mappings/user-1.json    | 48 +++++++++++++
 ...3d-a7bf-33a134d16dbe.json => gists-2.json} |  0
 ...1b0-9a8a-aa66277dfb8b.json => user-1.json} |  0
 .../mappings/gists-2-2f93ee.json              | 55 --------------
 .../lifecycleTest/mappings/gists-2.json       | 55 ++++++++++++++
 ...s_9faa55cd67b21a789bb44e34e5e41f72-3.json} |  0
 .../lifecycleTest/mappings/user-1-3380f8.json | 48 -------------
 .../lifecycleTest/mappings/user-1.json        | 48 +++++++++++++
 ...7c99a529b19a.json => gists_9903708-2.json} |  0
 ...b9d45e.json => gists_9903708_forks-7.json} |  0
 ...c00398.json => gists_9903708_forks-8.json} |  0
 ...dd0-8519-628a92aa66c5.json => user-1.json} |  0
 ...s_8edf855833a05ce8730d609fe8bd803a-9.json} |  0
 .../mappings/gists_9903708-2-ab2c9d.json      | 48 -------------
 .../starTest/mappings/gists_9903708-2.json    | 48 +++++++++++++
 .../gists_9903708_forks-7-42d6e4.json         | 55 --------------
 .../mappings/gists_9903708_forks-7.json       | 55 ++++++++++++++
 .../gists_9903708_forks-8-992bf5.json         | 48 -------------
 .../mappings/gists_9903708_forks-8.json       | 48 +++++++++++++
 ...-dc6fd4.json => gists_9903708_star-3.json} |  0
 ...-680201.json => gists_9903708_star-4.json} |  0
 ...-c7d88c.json => gists_9903708_star-5.json} |  0
 ...-584dc0.json => gists_9903708_star-6.json} |  0
 .../starTest/mappings/user-1-075004.json      | 48 -------------
 .../wiremock/starTest/mappings/user-1.json    | 48 +++++++++++++
 ...d8-b556-16335859de73.json => gists-1.json} |  0
 ...s_209fef72c25fe4b3f673437603ab6d5d-2.json} |  0
 .../mappings/gists-1-fde9aa.json              | 53 --------------
 .../testGitUpdater/mappings/gists-1.json      | 53 ++++++++++++++
 ...ef72c25fe4b3f673437603ab6d5d-2-d3ef0c.json | 52 --------------
 ...ts_209fef72c25fe4b3f673437603ab6d5d-2.json | 52 ++++++++++++++
 ...s_209fef72c25fe4b3f673437603ab6d5d-3.json} |  0
 ...4.json => orgs_github-api-test-org-6.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...hub-api-test-org_github-api_issues-5.json} |  0
 ...api-test-org_github-api_issues_313-6.json} |  0
 ...api-test-org_github-api_issues_313-9.json} |  0
 ...t-org_github-api_issues_313_events-7.json} |  0
 ...ithub-api_issues_events_2704815753-8.json} |  0
 .../orgs_github-api-test-org-6-097490.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-6.json  | 46 ++++++++++++
 ...thub-api-test-org_github-api-7-ef3199.json | 46 ------------
 ...epos_github-api-test-org_github-api-7.json | 46 ++++++++++++
 ...i-test-org_github-api_issues-5-218efd.json | 53 --------------
 ...thub-api-test-org_github-api_issues-5.json | 53 ++++++++++++++
 ...st-org_github-api_issues_313-6-989586.json | 52 --------------
 ...-api-test-org_github-api_issues_313-6.json | 52 ++++++++++++++
 ...st-org_github-api_issues_313-9-450e6f.json | 52 --------------
 ...-api-test-org_github-api_issues_313-9.json | 52 ++++++++++++++
 ...github-api_issues_313_events-7-ef9890.json | 45 ------------
 ...st-org_github-api_issues_313_events-7.json | 45 ++++++++++++
 ...api_issues_events_2704815753-8-306d40.json | 46 ------------
 ...github-api_issues_events_2704815753-8.json | 46 ++++++++++++
 ...8.json => orgs_github-api-test-org-1.json} |  0
 ...pos_github-api-test-org_github-api-2.json} |  0
 ...-test-org_github-api_issues_events-3.json} |  0
 ...ositories_206888201_issues_events-10.json} |  0
 ...ositories_206888201_issues_events-11.json} |  0
 ...ositories_206888201_issues_events-12.json} |  0
 ...ositories_206888201_issues_events-13.json} |  0
 ...ositories_206888201_issues_events-14.json} |  0
 ...ositories_206888201_issues_events-15.json} |  0
 ...ositories_206888201_issues_events-16.json} |  0
 ...positories_206888201_issues_events-4.json} |  0
 ...positories_206888201_issues_events-5.json} |  0
 ...positories_206888201_issues_events-6.json} |  0
 ...positories_206888201_issues_events-7.json} |  0
 ...positories_206888201_issues_events-8.json} |  0
 ...positories_206888201_issues_events-9.json} |  0
 .../orgs_github-api-test-org-1-b27b87.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-1.json  | 46 ++++++++++++
 ...thub-api-test-org_github-api-2-2afea7.json | 46 ------------
 ...epos_github-api-test-org_github-api-2.json | 46 ++++++++++++
 ...org_github-api_issues_events-3-d61292.json | 46 ------------
 ...i-test-org_github-api_issues_events-3.json | 46 ++++++++++++
 ...ies_206888201_issues_events-10-83c7ab.json | 46 ------------
 ...positories_206888201_issues_events-10.json | 46 ++++++++++++
 ...ies_206888201_issues_events-11-6f0d69.json | 46 ------------
 ...positories_206888201_issues_events-11.json | 46 ++++++++++++
 ...ies_206888201_issues_events-12-208a37.json | 46 ------------
 ...positories_206888201_issues_events-12.json | 46 ++++++++++++
 ...ies_206888201_issues_events-13-94dd8e.json | 46 ------------
 ...positories_206888201_issues_events-13.json | 46 ++++++++++++
 ...ies_206888201_issues_events-14-b1ad56.json | 46 ------------
 ...positories_206888201_issues_events-14.json | 46 ++++++++++++
 ...ies_206888201_issues_events-15-5f55d9.json | 46 ------------
 ...positories_206888201_issues_events-15.json | 46 ++++++++++++
 ...ies_206888201_issues_events-16-491772.json | 46 ------------
 ...positories_206888201_issues_events-16.json | 46 ++++++++++++
 ...ries_206888201_issues_events-4-2b6f60.json | 46 ------------
 ...epositories_206888201_issues_events-4.json | 46 ++++++++++++
 ...ries_206888201_issues_events-5-72a130.json | 46 ------------
 ...epositories_206888201_issues_events-5.json | 46 ++++++++++++
 ...ries_206888201_issues_events-6-9c193f.json | 46 ------------
 ...epositories_206888201_issues_events-6.json | 46 ++++++++++++
 ...ries_206888201_issues_events-7-654e00.json | 46 ------------
 ...epositories_206888201_issues_events-7.json | 46 ++++++++++++
 ...ries_206888201_issues_events-8-71d796.json | 46 ------------
 ...epositories_206888201_issues_events-8.json | 46 ++++++++++++
 ...ries_206888201_issues_events-9-286927.json | 46 ------------
 ...epositories_206888201_issues_events-9.json | 46 ++++++++++++
 ...-05c93470225d.json => licenses_mit-4.json} |  0
 ...son => repos_github-api_github-api-2.json} |  0
 ...epos_github-api_github-api_license-3.json} |  0
 ...c4c-8166-472f24fba13a.json => user-1.json} |  0
 .../mappings/licenses_mit-4-4cc836.json       | 47 ------------
 .../mappings/licenses_mit-4.json              | 47 ++++++++++++
 .../repos_github-api_github-api-2-631120.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...ithub-api_github-api_license-3-f6ba18.json | 48 -------------
 ...repos_github-api_github-api_license-3.json | 48 +++++++++++++
 .../mappings/user-1-eeb321.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...epos_github-api_github-api_license-3.json} |  0
 ...c8e-8f9f-153362753343.json => user-1.json} |  0
 .../repos_github-api_github-api-2-1f9552.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...ithub-api_github-api_license-3-b99917.json | 48 -------------
 ...repos_github-api_github-api_license-3.json | 48 +++++++++++++
 .../mappings/user-1-659cc2.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...2a0d7789f2.json => repos_atom_atom-2.json} |  0
 ...10.json => repos_atom_atom_license-3.json} |  0
 ...e52-8dfe-da122934c709.json => user-1.json} |  0
 .../mappings/repos_atom_atom-2-bd1153.json    | 48 -------------
 .../mappings/repos_atom_atom-2.json           | 48 +++++++++++++
 .../repos_atom_atom_license-3-a0fac7.json     | 48 -------------
 .../mappings/repos_atom_atom_license-3.json   | 48 +++++++++++++
 .../mappings/user-1-30af42.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...5abfcde8.json => repos_pomes_pomes-2.json} |  0
 ....json => repos_pomes_pomes_license-3.json} |  0
 ...641-a940-a567ff936667.json => user-1.json} |  0
 .../mappings/repos_pomes_pomes-2-7c3e7b.json  | 48 -------------
 .../mappings/repos_pomes_pomes-2.json         | 48 +++++++++++++
 .../repos_pomes_pomes_license-3-c59d46.json   | 48 -------------
 .../mappings/repos_pomes_pomes_license-3.json | 48 +++++++++++++
 .../mappings/user-1-767d65.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...4.txt => pomes_pomes_master_license-1.txt} |  0
 .../pomes_pomes_master_license-1-050b93.json  | 45 ------------
 .../pomes_pomes_master_license-1.json         | 45 ++++++++++++
 ...b582b604.json => repos_pomes_pomes-2.json} |  0
 ....json => repos_pomes_pomes_license-3.json} |  0
 ...106-b877-b8938a450623.json => user-1.json} |  0
 .../mappings/repos_pomes_pomes-2-c9deed.json  | 48 -------------
 .../mappings/repos_pomes_pomes-2.json         | 48 +++++++++++++
 .../repos_pomes_pomes_license-3-47a3f2.json   | 48 -------------
 .../mappings/repos_pomes_pomes_license-3.json | 48 +++++++++++++
 .../mappings/user-1-f33aa0.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...=> repos_github-api-test-org_empty-2.json} |  0
 ...0ad-a499-e3fb8ce52a3f.json => user-1.json} |  0
 ...os_github-api-test-org_empty-2-ed7892.json | 48 -------------
 .../repos_github-api-test-org_empty-2.json    | 48 +++++++++++++
 ..._github-api-test-org_empty_license-3.json} |  0
 .../mappings/user-1-3003d0.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...-e6f6e8c527fe.json => licenses_mit-2.json} |  0
 ...f1b-97cf-78ca1fb1fcb9.json => user-1.json} |  0
 .../mappings/licenses_mit-2-2182ea.json       | 47 ------------
 .../getLicense/mappings/licenses_mit-2.json   | 47 ++++++++++++
 .../getLicense/mappings/user-1-38876a.json    | 48 -------------
 .../wiremock/getLicense/mappings/user-1.json  | 48 +++++++++++++
 ...9b89-d0a7e8fcd2e8.json => licenses-2.json} |  0
 ...8ce-919e-54ccde4cdd28.json => user-1.json} |  0
 .../mappings/licenses-2-b3d307.json           | 47 ------------
 .../listLicenses/mappings/licenses-2.json     | 47 ++++++++++++
 .../listLicenses/mappings/user-1-dfe7f7.json  | 48 -------------
 .../listLicenses/mappings/user-1.json         | 48 +++++++++++++
 ...a35f-1ed72d7587a7.json => licenses-2.json} |  0
 ...f4d-96c1-7d6cfb5981c2.json => user-1.json} |  0
 .../mappings/licenses-2-f00fa6.json           | 47 ------------
 .../mappings/licenses-2.json                  | 47 ++++++++++++
 .../mappings/user-1-b8102c.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...isting-stubbed-plans-7-accounts-QgHUA.json | 63 ++++++++--------
 ...rketplace_listing-stubbed-plans-C43G2.json | 63 ++++++++--------
 ...isting-stubbed-plans-7-accounts-aoRnP.json | 63 ++++++++--------
 ...isting-stubbed-plans-8-accounts-NZw9v.json | 63 ++++++++--------
 ...isting-stubbed-plans-9-accounts-b1MbT.json | 63 ++++++++--------
 ...rketplace_listing-stubbed-plans-uewkE.json | 63 ++++++++--------
 ...isting-stubbed-plans-7-accounts-cz27N.json | 63 ++++++++--------
 ...isting-stubbed-plans-8-accounts-8T1Pb.json | 63 ++++++++--------
 ...isting-stubbed-plans-9-accounts-VT77w.json | 63 ++++++++--------
 ...rketplace_listing-stubbed-plans-xk1MF.json | 63 ++++++++--------
 ...rketplace_listing-stubbed-plans-ZDjdu.json | 63 ++++++++--------
 ...3.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...api-test-org_github-api_milestones-4.json} |  0
 ...i-test-org_github-api_milestones_2-5.json} |  0
 ...i-test-org_github-api_milestones_2-6.json} |  0
 ...i-test-org_github-api_milestones_2-7.json} |  0
 ...i-test-org_github-api_milestones_2-8.json} |  0
 ...c3f-8c58-f99bdf1cafe8.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-fdbcaf.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-701999.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...st-org_github-api_milestones-4-a7ebf1.json | 52 --------------
 ...-api-test-org_github-api_milestones-4.json | 52 ++++++++++++++
 ...-org_github-api_milestones_2-5-80930c.json | 54 --------------
 ...pi-test-org_github-api_milestones_2-5.json | 54 ++++++++++++++
 ...-org_github-api_milestones_2-6-865125.json | 51 -------------
 ...pi-test-org_github-api_milestones_2-6.json | 51 +++++++++++++
 ...-org_github-api_milestones_2-7-b24a5b.json | 54 --------------
 ...pi-test-org_github-api_milestones_2-7.json | 54 ++++++++++++++
 ...-org_github-api_milestones_2-8-fffe46.json | 48 -------------
 ...pi-test-org_github-api_milestones_2-8.json | 48 +++++++++++++
 .../mappings/user-1-7feb26.json               | 45 ------------
 .../testUpdateMilestone/mappings/user-1.json  | 45 ++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...a80-85dd-2c77586f7683.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-117186.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 .../test_toString/mappings/user-1-160947.json | 48 -------------
 .../test_toString/mappings/user-1.json        | 48 +++++++++++++
 ...9.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...6f6-83a4-52b7a1ff4765.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-b4a287.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-3-6d91c5.json | 55 --------------
 .../orgs_github-api-test-org_teams-3.json     | 55 ++++++++++++++
 .../mappings/user-1-b4c308.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_repos-4.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...884-8b04-c483ac0bf048.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-cf0714.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_repos-4-43cfd5.json | 55 --------------
 .../orgs_github-api-test-org_repos-4.json     | 55 ++++++++++++++
 ...gs_github-api-test-org_teams-3-beb3ba.json | 47 ------------
 .../orgs_github-api-test-org_teams-3.json     | 47 ++++++++++++
 .../mappings/user-1-58ae66.json               | 48 -------------
 .../testCreateRepository/mappings/user-1.json | 48 +++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_repos-4.json} |  0
 ... => orgs_github-api-test-org_teams-3.json} |  0
 ...pi-test-org_github-api-test_readme-5.json} |  0
 ...17b-8d74-29080bbc1c4c.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-7b0ac5.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_repos-4-423c77.json | 55 --------------
 .../orgs_github-api-test-org_repos-4.json     | 55 ++++++++++++++
 ...gs_github-api-test-org_teams-3-eb06b2.json | 47 ------------
 .../orgs_github-api-test-org_teams-3.json     | 47 ++++++++++++
 ...t-org_github-api-test_readme-5-12092c.json | 48 -------------
 ...api-test-org_github-api-test_readme-5.json | 48 +++++++++++++
 .../mappings/user-1-d246cf.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-4.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...b22845.json => teams_3531422_repos-5.json} |  0
 ...409-bb25-07ac6103a4fd.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-b46fc0.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-4-93bbb3.json | 55 --------------
 .../orgs_github-api-test-org_teams-4.json     | 55 ++++++++++++++
 ...thub-api-test-org_github-api-3-890724.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 .../teams_3531422_repos-5-9893d5.json         | 47 ------------
 .../mappings/teams_3531422_repos-5.json       | 47 ++++++++++++
 .../mappings/user-1-3a6b16.json               | 48 -------------
 .../testCreateTeam/mappings/user-1.json       | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-4.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...b450ac.json => teams_3501817_repos-5.json} |  0
 ...e00-860b-335d22d56f92.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-8c23f1.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-4-3459b0.json | 55 --------------
 .../orgs_github-api-test-org_teams-4.json     | 55 ++++++++++++++
 ...thub-api-test-org_github-api-3-25876e.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 .../teams_3501817_repos-5-97bad2.json         | 47 ------------
 .../mappings/teams_3501817_repos-5.json       | 47 ++++++++++++
 .../mappings/user-1-8620f0.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...9.json => orgs_github-api-test-org-1.json} |  0
 ...> orgs_github-api-test-org_members-2.json} |  0
 ...est-org_memberships_martinvanzijl2-5.json} |  0
 ...6b0-afc0-a73258da075d.json => user-6.json} |  0
 ...b3fdb.json => users_martinvanzijl2-3.json} |  0
 .../orgs_github-api-test-org-1-6480b3.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-1.json  | 46 ++++++++++++
 ..._github-api-test-org_members-2-e0db34.json | 45 ------------
 .../orgs_github-api-test-org_members-2.json   | 45 ++++++++++++
 ...pi-test-org_members_martinvanzijl2-4.json} |  0
 ...g_memberships_martinvanzijl2-5-d8831e.json | 52 --------------
 ...test-org_memberships_martinvanzijl2-5.json | 52 ++++++++++++++
 .../mappings/user-6-7e6e7d.json               | 48 -------------
 .../testInviteUser/mappings/user-6.json       | 48 +++++++++++++
 .../users_martinvanzijl2-3-26b89b.json        | 46 ------------
 .../mappings/users_martinvanzijl2-3.json      | 46 ++++++++++++
 ...9.json => orgs_github-api-test-org-2.json} |  0
 ...> orgs_github-api-test-org_members-3.json} |  0
 ...198-b2e6-ed290e9d780d.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-3ed483.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ..._github-api-test-org_members-3-ef9f50.json | 47 ------------
 .../orgs_github-api-test-org_members-3.json   | 47 ++++++++++++
 .../mappings/user-1-9e0ec7.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...> orgs_github-api-test-org_members-3.json} |  0
 ...f3e-8f7f-cecee94c5cef.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-6682f5.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ..._github-api-test-org_members-3-80be66.json | 47 ------------
 .../orgs_github-api-test-org_members-3.json   | 47 ++++++++++++
 .../mappings/user-1-a3604d.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...8.json => orgs_github-api-test-org-1.json} |  0
 ...pos_github-api-test-org_github-api-2.json} |  0
 ....json => users_github-api-test-org-3.json} |  0
 .../orgs_github-api-test-org-1-13f85d.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-1.json  | 46 ++++++++++++
 ...thub-api-test-org_github-api-2-b3a3de.json | 46 ------------
 ...epos_github-api-test-org_github-api-2.json | 46 ++++++++++++
 .../users_github-api-test-org-3-9edc4a.json   | 46 ------------
 .../mappings/users_github-api-test-org-3.json | 46 ++++++++++++
 ...e86857a3c99.json => users_kohsuke2-1.json} |  0
 .../mappings/users_kohsuke2-1-be47bc.json     | 46 ------------
 .../mappings/users_kohsuke2-1.json            | 46 ++++++++++++
 ...0.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...f.json => projects_3312444_columns-4.json} |  0
 ... => projects_columns_6706801_cards-5.json} |  0
 ...=> projects_columns_cards_27353270-6.json} |  0
 ...=> projects_columns_cards_27353270-7.json} |  0
 ...5a5-997a-d7b8568751cf.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-8a33ed.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-b659e6.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312444_columns-4-3be146.json    | 55 --------------
 .../mappings/projects_3312444_columns-4.json  | 55 ++++++++++++++
 ...ojects_columns_6706801_cards-5-45bdd9.json | 55 --------------
 .../projects_columns_6706801_cards-5.json     | 55 ++++++++++++++
 ...jects_columns_cards_27353270-6-97fd6c.json | 54 --------------
 .../projects_columns_cards_27353270-6.json    | 54 ++++++++++++++
 ...jects_columns_cards_27353270-7-75b0d2.json | 47 ------------
 .../projects_columns_cards_27353270-7.json    | 47 ++++++++++++
 .../mappings/user-1-0c7200.json               | 48 -------------
 .../testArchiveCard/mappings/user-1.json      | 48 +++++++++++++
 ...9.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ... => orgs_github-api-test-org_repos-6.json} |  0
 ...a.json => projects_3312449_columns-4.json} |  0
 ... => projects_columns_6706803_cards-5.json} |  0
 ... => projects_columns_6706803_cards-8.json} |  0
 ...t-org_repo-for-project-card_issues-7.json} |  0
 ...e78-85ca-b1ac911fdd4e.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-2cd475.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-bac54b.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 ...gs_github-api-test-org_repos-6-c2d819.json | 55 --------------
 .../orgs_github-api-test-org_repos-6.json     | 55 ++++++++++++++
 .../projects_3312449_columns-4-5b5040.json    | 55 --------------
 .../mappings/projects_3312449_columns-4.json  | 55 ++++++++++++++
 ...ojects_columns_6706803_cards-5-e6d34d.json | 55 --------------
 .../projects_columns_6706803_cards-5.json     | 55 ++++++++++++++
 ...ojects_columns_6706803_cards-8-6458c3.json | 55 --------------
 .../projects_columns_6706803_cards-8.json     | 55 ++++++++++++++
 ...api-test-org_repo-for-project-card-9.json} |  0
 ...repo-for-project-card_issues-7-29d82e.json | 55 --------------
 ...st-org_repo-for-project-card_issues-7.json | 55 ++++++++++++++
 .../mappings/user-1-b9c4ba.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...2.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...4.json => projects_3312442_columns-4.json} |  0
 ... => projects_columns_6706799_cards-5.json} |  0
 ...22b-807b-bc8c1f2bd313.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-a73c27.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-fd95c8.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312442_columns-4-264f75.json    | 55 --------------
 .../mappings/projects_3312442_columns-4.json  | 55 ++++++++++++++
 ...ojects_columns_6706799_cards-5-0a15ce.json | 55 --------------
 .../projects_columns_6706799_cards-5.json     | 55 ++++++++++++++
 .../mappings/user-1-80e348.json               | 48 -------------
 .../testCreatedCard/mappings/user-1.json      | 48 +++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...8.json => projects_3312447_columns-4.json} |  0
 ... => projects_columns_6706802_cards-5.json} |  0
 ...07b-a3e3-4533d04dd4b0.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-467a39.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-491fbb.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312447_columns-4-f80b32.json    | 55 --------------
 .../mappings/projects_3312447_columns-4.json  | 55 ++++++++++++++
 ...ojects_columns_6706802_cards-5-aad1d6.json | 55 --------------
 .../projects_columns_6706802_cards-5.json     | 55 ++++++++++++++
 ...=> projects_columns_cards_27353272-6.json} |  0
 ...=> projects_columns_cards_27353272-7.json} |  0
 .../mappings/user-1-c2f32b.json               | 48 -------------
 .../testDeleteCard/mappings/user-1.json       | 48 +++++++++++++
 ...2.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...e.json => projects_3312443_columns-4.json} |  0
 ... => projects_columns_6706800_cards-5.json} |  0
 ...=> projects_columns_cards_27353267-6.json} |  0
 ...=> projects_columns_cards_27353267-7.json} |  0
 ...af5-be72-d00bf6403051.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-049038.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-68e871.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312443_columns-4-1de47f.json    | 55 --------------
 .../mappings/projects_3312443_columns-4.json  | 55 ++++++++++++++
 ...ojects_columns_6706800_cards-5-695ce5.json | 55 --------------
 .../projects_columns_6706800_cards-5.json     | 55 ++++++++++++++
 ...jects_columns_cards_27353267-6-62a0d7.json | 54 --------------
 .../projects_columns_cards_27353267-6.json    | 54 ++++++++++++++
 ...jects_columns_cards_27353267-7-93c5d2.json | 47 ------------
 .../projects_columns_cards_27353267-7.json    | 47 ++++++++++++
 .../mappings/user-1-355d68.json               | 48 -------------
 .../testEditCardNote/mappings/user-1.json     | 48 +++++++++++++
 ...8.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...2.json => projects_3312440_columns-4.json} |  0
 ...0ee-aa60-c006643154d2.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-7feb42.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-42bd7d.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312440_columns-4-eb5863.json    | 55 --------------
 .../mappings/projects_3312440_columns-4.json  | 55 ++++++++++++++
 .../mappings/user-1-ff30f9.json               | 48 -------------
 .../testCreatedColumn/mappings/user-1.json    | 48 +++++++++++++
 ...2.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...3.json => projects_3312441_columns-4.json} |  0
 ...efb-9719-ea27f8d05b59.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-f4a059.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-bfb7de.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312441_columns-4-fb6e53.json    | 55 --------------
 .../mappings/projects_3312441_columns-4.json  | 55 ++++++++++++++
 ...e.json => projects_columns_6706794-5.json} |  0
 ...e.json => projects_columns_6706794-6.json} |  0
 .../mappings/user-1-f818b6.json               | 48 -------------
 .../testDeleteColumn/mappings/user-1.json     | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...7.json => projects_3312439_columns-4.json} |  0
 ...7.json => projects_columns_6706791-5.json} |  0
 ...d.json => projects_columns_6706791-6.json} |  0
 ...73e-9454-cb601fb759b9.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-eb0425.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-97b70b.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../projects_3312439_columns-4-082ed3.json    | 55 --------------
 .../mappings/projects_3312439_columns-4.json  | 55 ++++++++++++++
 .../projects_columns_6706791-5-85f356.json    | 54 --------------
 .../mappings/projects_columns_6706791-5.json  | 54 ++++++++++++++
 .../projects_columns_6706791-6-1cfa5d.json    | 47 ------------
 .../mappings/projects_columns_6706791-6.json  | 47 ++++++++++++
 .../mappings/user-1-e21e45.json               | 48 -------------
 .../testEditColumnName/mappings/user-1.json   | 48 +++++++++++++
 ...1.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...ebf-9609-48b2120173b7.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-713f01.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-e5afd9.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../mappings/user-1-a9a3d2.json               | 48 -------------
 .../testCreatedProject/mappings/user-1.json   | 48 +++++++++++++
 ...4.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...6b2-8598-59567e17ed99.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-c30240.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-daa6c2.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 ...-4-f50762.json => projects_3312437-4.json} |  0
 ...-5-8b8e6f.json => projects_3312437-5.json} |  0
 .../mappings/user-1-9cb867.json               | 48 -------------
 .../testDeleteProject/mappings/user-1.json    | 48 +++++++++++++
 ...2.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...175a59756.json => projects_3312435-4.json} |  0
 ...7bbc15474.json => projects_3312435-5.json} |  0
 ...080-af72-92346bb25688.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-2e39c7.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-08231b.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../mappings/projects_3312435-4-004d34.json   | 54 --------------
 .../mappings/projects_3312435-4.json          | 54 ++++++++++++++
 .../mappings/projects_3312435-5-76e0c2.json   | 47 ------------
 .../mappings/projects_3312435-5.json          | 47 ++++++++++++
 .../mappings/user-1-b2b126.json               | 48 -------------
 .../testEditProjectBody/mappings/user-1.json  | 48 +++++++++++++
 ...8.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...74592a3b9.json => projects_3312436-4.json} |  0
 ...bd20af717.json => projects_3312436-5.json} |  0
 ...129-8f7b-ad60f5fff91a.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-e3d87f.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-6a0a46.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../mappings/projects_3312436-4-20ac7f.json   | 54 --------------
 .../mappings/projects_3312436-4.json          | 54 ++++++++++++++
 .../mappings/projects_3312436-5-6c28d5.json   | 47 ------------
 .../mappings/projects_3312436-5.json          | 47 ++++++++++++
 .../mappings/user-1-115e61.json               | 48 -------------
 .../testEditProjectName/mappings/user-1.json  | 48 +++++++++++++
 ...a.json => orgs_github-api-test-org-2.json} |  0
 ... orgs_github-api-test-org_projects-3.json} |  0
 ...644011a44.json => projects_3312433-4.json} |  0
 ...c91168ec0.json => projects_3312433-5.json} |  0
 ...af9-baca-a6e1266d1b4a.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-a522b5.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...github-api-test-org_projects-3-ee429e.json | 55 --------------
 .../orgs_github-api-test-org_projects-3.json  | 55 ++++++++++++++
 .../mappings/projects_3312433-4-55b16b.json   | 54 --------------
 .../mappings/projects_3312433-4.json          | 54 ++++++++++++++
 .../mappings/projects_3312433-5-715884.json   | 47 ------------
 .../mappings/projects_3312433-5.json          | 47 ++++++++++++
 .../mappings/user-1-f7605e.json               | 48 -------------
 .../testEditProjectState/mappings/user-1.json | 48 +++++++++++++
 ...f.json => orgs_github-api-test-org-2.json} |  0
 ...os_github-api-test-org_github-api-10.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-8.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...-api-test-org_github-api_pulls_272-6.json} |  0
 ...-api-test-org_github-api_pulls_272-7.json} |  0
 ...-api-test-org_github-api_pulls_272-9.json} |  0
 ...191-bbef-d348f1330beb.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-24dc8a.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...hub-api-test-org_github-api-10-b2a378.json | 50 -------------
 ...pos_github-api-test-org_github-api-10.json | 50 +++++++++++++
 ...thub-api-test-org_github-api-3-0f9ebc.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-5-1db040.json | 51 -------------
 ...epos_github-api-test-org_github-api-5.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-8-d6b189.json | 51 -------------
 ...epos_github-api-test-org_github-api-8.json | 51 +++++++++++++
 ...hub-api-test-org_github-api_pulls-11.json} |  0
 ...pi-test-org_github-api_pulls-4-607242.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...est-org_github-api_pulls_272-6-480ea0.json | 51 -------------
 ...b-api-test-org_github-api_pulls_272-6.json | 51 +++++++++++++
 ...est-org_github-api_pulls_272-7-601780.json | 54 --------------
 ...b-api-test-org_github-api_pulls_272-7.json | 54 ++++++++++++++
 ...est-org_github-api_pulls_272-9-649296.json | 50 -------------
 ...b-api-test-org_github-api_pulls_272-9.json | 50 +++++++++++++
 .../mappings/user-1-b08f02.json               | 48 -------------
 .../closePullRequest/mappings/user-1.json     | 48 +++++++++++++
 ...d.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-7.json} |  0
 ...-api-test-org_github-api_pulls_321-5.json} |  0
 ...-api-test-org_github-api_pulls_321-6.json} |  0
 ...-api-test-org_github-api_pulls_321-8.json} |  0
 ...0c9-b4f2-f8fd982edf1a.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-449cef.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-260db5.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...pi-test-org_github-api_pulls-4-f9c86d.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-7-40b2ed.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-7.json | 47 ++++++++++++
 ...est-org_github-api_pulls_321-5-91de84.json | 51 -------------
 ...b-api-test-org_github-api_pulls_321-5.json | 51 +++++++++++++
 ...est-org_github-api_pulls_321-6-b01981.json | 51 -------------
 ...b-api-test-org_github-api_pulls_321-6.json | 51 +++++++++++++
 ...est-org_github-api_pulls_321-8-ec3d90.json | 50 -------------
 ...b-api-test-org_github-api_pulls_321-8.json | 50 +++++++++++++
 .../mappings/user-1-26b175.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...a.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-6.json} |  0
 ...-api-test-org_github-api_pulls_273-7.json} |  0
 ...3e2-b41b-bf3f95f79276.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-b2d80e.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-e04f90.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-5-315877.json | 50 -------------
 ...epos_github-api-test-org_github-api-5.json | 50 +++++++++++++
 ...pi-test-org_github-api_pulls-4-e39355.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-6-21bacc.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-6.json | 47 ++++++++++++
 ...est-org_github-api_pulls_273-7-667126.json | 54 --------------
 ...b-api-test-org_github-api_pulls_273-7.json | 54 ++++++++++++++
 .../mappings/user-1-17990d.json               | 48 -------------
 .../createPullRequest/mappings/user-1.json    | 48 +++++++++++++
 ...c.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...org_github-api_issues_270_comments-5.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-7.json} |  0
 ...-api-test-org_github-api_pulls_270-8.json} |  0
 ...fad-a2c9-539e3a21fe94.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-ad4f34.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-de7260.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-6-6e0179.json | 50 -------------
 ...epos_github-api-test-org_github-api-6.json | 50 +++++++++++++
 ...thub-api_issues_270_comments-5-2cd4dd.json | 55 --------------
 ...-org_github-api_issues_270_comments-5.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-4-4e9dad.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-7-420dc2.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-7.json | 47 ++++++++++++
 ...est-org_github-api_pulls_270-8-1a6fbb.json | 54 --------------
 ...b-api-test-org_github-api_pulls_270-8.json | 54 ++++++++++++++
 .../mappings/user-1-c4d4d6.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...hub-api-test-org_github-api_pulls-10.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-8.json} |  0
 ...api-test-org_github-api_pulls_263-11.json} |  0
 ...-api-test-org_github-api_pulls_263-6.json} |  0
 ...01d-be2b-0c5847525fc3.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-9700f9.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-c0d68f.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-5-e79ad5.json | 51 -------------
 ...epos_github-api-test-org_github-api-5.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-7-43e688.json | 51 -------------
 ...epos_github-api-test-org_github-api-7.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-9-ab2303.json | 50 -------------
 ...epos_github-api-test-org_github-api-9.json | 50 +++++++++++++
 ...i-test-org_github-api_pulls-10-5f8eb0.json | 49 -------------
 ...thub-api-test-org_github-api_pulls-10.json | 49 +++++++++++++
 ...pi-test-org_github-api_pulls-4-344c3b.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-8-e32f79.json | 50 -------------
 ...ithub-api-test-org_github-api_pulls-8.json | 50 +++++++++++++
 ...st-org_github-api_pulls_263-11-efb364.json | 54 --------------
 ...-api-test-org_github-api_pulls_263-11.json | 54 ++++++++++++++
 ...est-org_github-api_pulls_263-6-034f14.json | 48 -------------
 ...b-api-test-org_github-api_pulls_263-6.json | 48 +++++++++++++
 .../getUserTest/mappings/user-1-079798.json   | 48 -------------
 .../wiremock/getUserTest/mappings/user-1.json | 48 +++++++++++++
 ...0.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...9b8cd56782d11ea45adcf062eade17528e-8.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...-api-test-org_github-api_pulls_309-5.json} |  0
 ...-api-test-org_github-api_pulls_309-6.json} |  0
 ...-api-test-org_github-api_pulls_309-7.json} |  0
 ...7e3-b48e-c86bcc461b58.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-e3ff36.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-7a223c.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...6782d11ea45adcf062eade17528e-8-59cc88.json | 48 -------------
 ...a9b8cd56782d11ea45adcf062eade17528e-8.json | 48 +++++++++++++
 ...pi-test-org_github-api_pulls-4-361c15.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...est-org_github-api_pulls_309-5-1566b3.json | 51 -------------
 ...b-api-test-org_github-api_pulls_309-5.json | 51 +++++++++++++
 ...est-org_github-api_pulls_309-6-c8fd7b.json | 51 -------------
 ...b-api-test-org_github-api_pulls_309-6.json | 51 +++++++++++++
 ...est-org_github-api_pulls_309-7-979661.json | 50 -------------
 ...b-api-test-org_github-api_pulls_309-7.json | 50 +++++++++++++
 .../mappings/user-1-c2903f.json               | 48 -------------
 .../mergeCommitSHA/mappings/user-1.json       | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ...os_github-api-test-org_github-api-12.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...hub-api-test-org_github-api_pulls-13.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...api-test-org_github-api_pulls_266-14.json} |  0
 ...-org_github-api_pulls_266_comments-6.json} |  0
 ...-org_github-api_pulls_266_comments-7.json} |  0
 ...-org_github-api_pulls_266_comments-9.json} |  0
 ...ithub-api_pulls_comments_321995146-8.json} |  0
 ...b76-b07e-0a00bae61fff.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-079c3d.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...hub-api-test-org_github-api-12-9090d2.json | 50 -------------
 ...pos_github-api-test-org_github-api-12.json | 50 +++++++++++++
 ...thub-api-test-org_github-api-3-d585b5.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...i-test-org_github-api_pulls-13-80451b.json | 47 ------------
 ...thub-api-test-org_github-api_pulls-13.json | 47 ++++++++++++
 ...pi-test-org_github-api_pulls-4-145b44.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...st-org_github-api_pulls_266-14-f8bf7b.json | 54 --------------
 ...-api-test-org_github-api_pulls_266-14.json | 54 ++++++++++++++
 ...org_github-api_pulls_266_comments-11.json} |  0
 ...-org_github-api_pulls_266_comments-5.json} |  0
 ...ithub-api_pulls_266_comments-6-b9a8cb.json | 55 --------------
 ...t-org_github-api_pulls_266_comments-6.json | 55 ++++++++++++++
 ...ithub-api_pulls_266_comments-7-874427.json | 50 -------------
 ...t-org_github-api_pulls_266_comments-7.json | 50 +++++++++++++
 ...ithub-api_pulls_266_comments-9-8d629b.json | 50 -------------
 ...t-org_github-api_pulls_266_comments-9.json | 50 +++++++++++++
 ...thub-api_pulls_comments_321995146-10.json} |  0
 ...api_pulls_comments_321995146-8-d0df75.json | 54 --------------
 ...github-api_pulls_comments_321995146-8.json | 54 ++++++++++++++
 .../mappings/user-1-f74219.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...os_github-api-test-org_github-api-11.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...hub-api-test-org_github-api_pulls-12.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...api-test-org_github-api_pulls_258-13.json} |  0
 ...t-org_github-api_pulls_258_reviews-5.json} |  0
 ...t-org_github-api_pulls_258_reviews-6.json} |  0
 ...t-org_github-api_pulls_258_reviews-9.json} |  0
 ...lls_258_reviews_285200956_comments-8.json} |  0
 ...pulls_258_reviews_285200956_events-7.json} |  0
 ...b-api_pulls_258_reviews_285200957-10.json} |  0
 ...d6f-b8cc-93a9d7deb4d0.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-3f7614.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...hub-api-test-org_github-api-11-029a57.json | 50 -------------
 ...pos_github-api-test-org_github-api-11.json | 50 +++++++++++++
 ...thub-api-test-org_github-api-3-1efd2a.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...i-test-org_github-api_pulls-12-0c75c0.json | 47 ------------
 ...thub-api-test-org_github-api_pulls-12.json | 47 ++++++++++++
 ...pi-test-org_github-api_pulls-4-7f2095.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...st-org_github-api_pulls_258-13-9406e5.json | 54 --------------
 ...-api-test-org_github-api_pulls_258-13.json | 54 ++++++++++++++
 ...github-api_pulls_258_reviews-5-1fe517.json | 54 --------------
 ...st-org_github-api_pulls_258_reviews-5.json | 54 ++++++++++++++
 ...github-api_pulls_258_reviews-6-56d549.json | 47 ------------
 ...st-org_github-api_pulls_258_reviews-6.json | 47 ++++++++++++
 ...github-api_pulls_258_reviews-9-be8b55.json | 54 --------------
 ...st-org_github-api_pulls_258_reviews-9.json | 54 ++++++++++++++
 ...8_reviews_285200956_comments-8-15c1e2.json | 47 ------------
 ...ulls_258_reviews_285200956_comments-8.json | 47 ++++++++++++
 ...258_reviews_285200956_events-7-d0f59a.json | 54 --------------
 ..._pulls_258_reviews_285200956_events-7.json | 54 ++++++++++++++
 ...pulls_258_reviews_285200957-10-886b3f.json | 47 ------------
 ...ub-api_pulls_258_reviews_285200957-10.json | 47 ++++++++++++
 .../mappings/user-1-e24b33.json               | 48 -------------
 .../pullRequestReviews/mappings/user-1.json   | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-5.json} |  0
 ...thub-api-test-org_github-api_pulls-6.json} |  0
 ...thub-api-test-org_github-api_pulls-8.json} |  0
 ...api-test-org_github-api_pulls_259-10.json} |  0
 ...-api-test-org_github-api_pulls_260-9.json} |  0
 ...b83-acd4-b1c3e2f4f684.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-9de3bb.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-f81e50.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-7-684ed3.json | 50 -------------
 ...epos_github-api-test-org_github-api-7.json | 50 +++++++++++++
 ...pi-test-org_github-api_pulls-4-a2c01b.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-5-9afc3a.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-5.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-6-ab7461.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-6.json | 47 ++++++++++++
 ...pi-test-org_github-api_pulls-8-4e73cd.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-8.json | 47 ++++++++++++
 ...st-org_github-api_pulls_259-10-5f1852.json | 54 --------------
 ...-api-test-org_github-api_pulls_259-10.json | 54 ++++++++++++++
 ...est-org_github-api_pulls_260-9-6162e3.json | 54 --------------
 ...b-api-test-org_github-api_pulls_260-9.json | 54 ++++++++++++++
 .../mappings/user-1-4966fe.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...c.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-5.json} |  0
 ...thub-api-test-org_github-api_pulls-6.json} |  0
 ...thub-api-test-org_github-api_pulls-8.json} |  0
 ...-api-test-org_github-api_pulls_268-9.json} |  0
 ...api-test-org_github-api_pulls_269-10.json} |  0
 ...77e-aafe-59a7869f4ae9.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-80e70a.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-10e587.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-7-db8422.json | 50 -------------
 ...epos_github-api-test-org_github-api-7.json | 50 +++++++++++++
 ...pi-test-org_github-api_pulls-4-cc0392.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-5-373344.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-5.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-6-3d58d4.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-6.json | 47 ++++++++++++
 ...pi-test-org_github-api_pulls-8-cfa90e.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-8.json | 47 ++++++++++++
 ...est-org_github-api_pulls_268-9-08817e.json | 54 --------------
 ...b-api-test-org_github-api_pulls_268-9.json | 54 ++++++++++++++
 ...st-org_github-api_pulls_269-10-b5427c.json | 54 --------------
 ...-api-test-org_github-api_pulls_269-10.json | 54 ++++++++++++++
 .../mappings/user-1-69a2a9.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...1.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...pos_github-api-test-org_github-api-8.json} |  0
 ...api-test-org_github-api_issues_271-5.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...thub-api-test-org_github-api_pulls-9.json} |  0
 ...api-test-org_github-api_pulls_271-10.json} |  0
 ...-api-test-org_github-api_pulls_271-7.json} |  0
 ...ec6-8270-519114eef6f6.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-41c140.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-f25bc1.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-6-6415bd.json | 51 -------------
 ...epos_github-api-test-org_github-api-6.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-8-d2df6f.json | 50 -------------
 ...epos_github-api-test-org_github-api-8.json | 50 +++++++++++++
 ...st-org_github-api_issues_271-5-9171d9.json | 54 --------------
 ...-api-test-org_github-api_issues_271-5.json | 54 ++++++++++++++
 ...pi-test-org_github-api_pulls-4-8c7123.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...pi-test-org_github-api_pulls-9-aee9a7.json | 47 ------------
 ...ithub-api-test-org_github-api_pulls-9.json | 47 ++++++++++++
 ...st-org_github-api_pulls_271-10-ff9fa1.json | 54 --------------
 ...-api-test-org_github-api_pulls_271-10.json | 54 ++++++++++++++
 ...est-org_github-api_pulls_271-7-844a41.json | 48 -------------
 ...b-api-test-org_github-api_pulls_271-7.json | 48 +++++++++++++
 .../setAssignee/mappings/user-1-27e106.json   | 48 -------------
 .../wiremock/setAssignee/mappings/user-1.json | 48 +++++++++++++
 ...9.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...api-test-org_github-api_issues_264-5.json} |  0
 ...api-test-org_github-api_issues_264-8.json} |  0
 ...hub-api-test-org_github-api_pulls-10.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...api-test-org_github-api_pulls_264-11.json} |  0
 ...-api-test-org_github-api_pulls_264-7.json} |  0
 ...f28-9d66-5f45ffbb3a7c.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-04e112.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-1b1c68.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-6-4e2383.json | 51 -------------
 ...epos_github-api-test-org_github-api-6.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-9-caba78.json | 50 -------------
 ...epos_github-api-test-org_github-api-9.json | 50 +++++++++++++
 ...st-org_github-api_issues_264-5-52c082.json | 54 --------------
 ...-api-test-org_github-api_issues_264-5.json | 54 ++++++++++++++
 ...st-org_github-api_issues_264-8-1421d6.json | 48 -------------
 ...-api-test-org_github-api_issues_264-8.json | 48 +++++++++++++
 ...i-test-org_github-api_pulls-10-bd497d.json | 47 ------------
 ...thub-api-test-org_github-api_pulls-10.json | 47 ++++++++++++
 ...pi-test-org_github-api_pulls-4-7af49b.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...st-org_github-api_pulls_264-11-cfd2cf.json | 54 --------------
 ...-api-test-org_github-api_pulls_264-11.json | 54 ++++++++++++++
 ...est-org_github-api_pulls_264-7-462782.json | 48 -------------
 ...b-api-test-org_github-api_pulls_264-7.json | 48 +++++++++++++
 .../setLabels/mappings/user-1-946afc.json     | 48 -------------
 .../wiremock/setLabels/mappings/user-1.json   | 48 +++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ...os_github-api-test-org_github-api-12.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...rg_github-api_contents_squashmerge-8.json} |  0
 ...b-api-test-org_github-api_git_refs-6.json} |  0
 ...g_github-api_git_refs_heads_master-4.json} |  0
 ...hub-api-test-org_github-api_pulls-10.json} |  0
 ...613-88c7-dcba8c693074.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-b35d6e.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...hub-api-test-org_github-api-12-5f2832.json | 50 -------------
 ...pos_github-api-test-org_github-api-12.json | 50 +++++++++++++
 ...thub-api-test-org_github-api-3-957364.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-5-6395c5.json | 51 -------------
 ...epos_github-api-test-org_github-api-5.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-7-3bd5c3.json | 51 -------------
 ...epos_github-api-test-org_github-api-7.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-9-7331ed.json | 51 -------------
 ...epos_github-api-test-org_github-api-9.json | 51 +++++++++++++
 ...hub-api_contents_squashmerge-8-04ae84.json | 54 --------------
 ...org_github-api_contents_squashmerge-8.json | 54 ++++++++++++++
 ...test-org_github-api_git_refs-6-9d910f.json | 55 --------------
 ...ub-api-test-org_github-api_git_refs-6.json | 55 ++++++++++++++
 ...ub-api_git_refs_heads_master-4-7bfa93.json | 49 -------------
 ...rg_github-api_git_refs_heads_master-4.json | 49 +++++++++++++
 ...i-test-org_github-api_pulls-10-d149e4.json | 55 --------------
 ...thub-api-test-org_github-api_pulls-10.json | 55 ++++++++++++++
 ...hub-api-test-org_github-api_pulls-13.json} |  0
 ...st-org_github-api_pulls_267_merge-11.json} |  0
 .../squashMerge/mappings/user-1-b37e46.json   | 48 -------------
 .../wiremock/squashMerge/mappings/user-1.json | 48 +++++++++++++
 ...0.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...-api-test-org_github-api_pulls_299-7.json} |  0
 ...-api_pulls_299_requested_reviewers-6.json} |  0
 ...0d5-bc1e-4414411ca129.json => user-1.json} |  0
 ...a7375923fa0.json => users_kohsuke2-5.json} |  0
 .../orgs_github-api-test-org-2-4b0623.json    | 45 ------------
 .../mappings/orgs_github-api-test-org-2.json  | 45 ++++++++++++
 ...thub-api-test-org_github-api-3-cafd01.json | 45 ------------
 ...epos_github-api-test-org_github-api-3.json | 45 ++++++++++++
 ...pi-test-org_github-api_pulls-4-e7589e.json | 52 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 52 ++++++++++++++
 ...est-org_github-api_pulls_299-7-59c375.json | 45 ------------
 ...b-api-test-org_github-api_pulls_299-7.json | 45 ++++++++++++
 ...ulls_299_requested_reviewers-6-38f876.json | 52 --------------
 ...b-api_pulls_299_requested_reviewers-6.json | 52 ++++++++++++++
 .../mappings/user-1-77ed94.json               | 45 ------------
 .../mappings/user-1.json                      | 45 ++++++++++++
 .../mappings/users_kohsuke2-5-8bcfc0.json     | 45 ------------
 .../mappings/users_kohsuke2-5.json            | 45 ++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ... => orgs_github-api-test-org_teams-5.json} |  0
 ...thub-api-test-org_teams_dummy-team-9.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...thub-api-test-org_github-api_pulls-4.json} |  0
 ...-api-test-org_github-api_pulls_304-7.json} |  0
 ...-api_pulls_304_requested_reviewers-6.json} |  0
 ...f987a3704a98.json => teams_3451996-8.json} |  0
 ...2fe-936e-b94485a32618.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-8634de.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...gs_github-api-test-org_teams-5-b84882.json | 44 ------------
 .../orgs_github-api-test-org_teams-5.json     | 44 ++++++++++++
 ...pi-test-org_teams_dummy-team-9-7052ee.json | 46 ------------
 ...ithub-api-test-org_teams_dummy-team-9.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-3-92a8e4.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...pi-test-org_github-api_pulls-4-f9eb4c.json | 55 --------------
 ...ithub-api-test-org_github-api_pulls-4.json | 55 ++++++++++++++
 ...est-org_github-api_pulls_304-7-e091cb.json | 48 -------------
 ...b-api-test-org_github-api_pulls_304-7.json | 48 +++++++++++++
 ...ulls_304_requested_reviewers-6-7df569.json | 55 --------------
 ...b-api_pulls_304_requested_reviewers-6.json | 55 ++++++++++++++
 .../mappings/teams_3451996-8-112cf6.json      | 48 -------------
 .../mappings/teams_3451996-8.json             | 48 +++++++++++++
 .../mappings/user-1-c23a7f.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...9.json => orgs_github-api-test-org-2.json} |  0
 ...os_github-api-test-org_github-api-11.json} |  0
 ...os_github-api-test-org_github-api-14.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...contents_updatecontentsquashmerge-10.json} |  0
 ..._contents_updatecontentsquashmerge-8.json} |  0
 ...b-api-test-org_github-api_git_refs-6.json} |  0
 ...g_github-api_git_refs_heads_master-4.json} |  0
 ...hub-api-test-org_github-api_pulls-12.json} |  0
 ...5ef-97f7-fabf21edf0e2.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-ad1f58.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...hub-api-test-org_github-api-11-262129.json | 51 -------------
 ...pos_github-api-test-org_github-api-11.json | 51 +++++++++++++
 ...hub-api-test-org_github-api-14-ab6495.json | 50 -------------
 ...pos_github-api-test-org_github-api-14.json | 50 +++++++++++++
 ...thub-api-test-org_github-api-3-5e4301.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-5-620a6c.json | 51 -------------
 ...epos_github-api-test-org_github-api-5.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-7-3baea0.json | 51 -------------
 ...epos_github-api-test-org_github-api-7.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-9-ea7712.json | 51 -------------
 ...epos_github-api-test-org_github-api-9.json | 51 +++++++++++++
 ...ts_updatecontentsquashmerge-10-70ad84.json | 54 --------------
 ..._contents_updatecontentsquashmerge-10.json | 54 ++++++++++++++
 ...nts_updatecontentsquashmerge-8-1d6973.json | 54 --------------
 ...i_contents_updatecontentsquashmerge-8.json | 54 ++++++++++++++
 ...test-org_github-api_git_refs-6-778d66.json | 55 --------------
 ...ub-api-test-org_github-api_git_refs-6.json | 55 ++++++++++++++
 ...ub-api_git_refs_heads_master-4-fa77be.json | 49 -------------
 ...rg_github-api_git_refs_heads_master-4.json | 49 +++++++++++++
 ...i-test-org_github-api_pulls-12-c55f08.json | 55 --------------
 ...thub-api-test-org_github-api_pulls-12.json | 55 ++++++++++++++
 ...hub-api-test-org_github-api_pulls-15.json} |  0
 ...st-org_github-api_pulls_261_merge-13.json} |  0
 .../mappings/user-1-78c048.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...f.json => orgs_github-api-test-org-4.json} |  0
 ...7b-e0159afa8208.json => rate_limit-2.json} |  0
 ...95-459b2c47bf98.json => rate_limit-3.json} |  0
 ...56-34f9b4d707be.json => rate_limit-5.json} |  0
 ...6c7-aeb1-888c34085d4a.json => user-1.json} |  0
 .../orgs_github-api-test-org-4-7ea37b.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-4.json  | 48 +++++++++++++
 .../mappings/rate_limit-2-f22b1c.json         | 46 ------------
 .../mappings/rate_limit-2.json                | 46 ++++++++++++
 .../mappings/rate_limit-3-a1f82a.json         | 46 ------------
 .../mappings/rate_limit-3.json                | 46 ++++++++++++
 .../mappings/rate_limit-5-4e2fc3.json         | 45 ------------
 .../mappings/rate_limit-5.json                | 45 ++++++++++++
 .../mappings/user-1-a460fd.json               | 48 -------------
 .../testGitHubRateLimit/mappings/user-1.json  | 48 +++++++++++++
 ...7b-e0159afa8208.json => rate_limit-2.json} |  0
 ...95-459b2c47bf98.json => rate_limit-3.json} |  0
 ...56-34f9b4d707be.json => rate_limit-5.json} |  0
 ...6c7-aeb1-888c34085d4a.json => user-1.json} |  0
 .../mappings/rate_limit-2-f22b1c.json         | 46 ------------
 .../mappings/rate_limit-2.json                | 46 ++++++++++++
 .../mappings/rate_limit-3-a1f82a.json         | 46 ------------
 .../mappings/rate_limit-3.json                | 46 ++++++++++++
 .../mappings/rate_limit-5-4e2fc3.json         | 45 ------------
 .../mappings/rate_limit-5.json                | 45 ++++++++++++
 .../mappings/user-1-a460fd.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...7b-e0159afa8208.json => rate_limit-2.json} |  0
 ...95-459b2c47bf98.json => rate_limit-3.json} |  0
 ...56-34f9b4d707be.json => rate_limit-5.json} |  0
 ...6c7-aeb1-888c34085d4a.json => user-1.json} |  0
 .../mappings/rate_limit-2-f22b1c.json         | 46 ------------
 .../mappings/rate_limit-2.json                | 46 ++++++++++++
 .../mappings/rate_limit-3-a1f82a.json         | 46 ------------
 .../mappings/rate_limit-3.json                | 46 ++++++++++++
 .../mappings/rate_limit-5-4e2fc3.json         | 45 ------------
 .../mappings/rate_limit-5.json                | 45 ++++++++++++
 .../mappings/user-1-a460fd.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...rg_github-api_stats_code_frequency-4.json} |  0
 ...bd3-b83d-138831bc0e49.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-17df55.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-6fede0.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...hub-api_stats_code_frequency-4-09de1d.json | 47 ------------
 ...org_github-api_stats_code_frequency-4.json | 47 ++++++++++++
 .../mappings/user-1-2c19f6.json               | 48 -------------
 .../testCodeFrequency/mappings/user-1.json    | 48 +++++++++++++
 ...a.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...g_github-api_stats_commit_activity-4.json} |  0
 ...76b-bebd-29a7129c9b2d.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-4edea4.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-6f33ad.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...ub-api_stats_commit_activity-4-54ebe0.json | 47 ------------
 ...rg_github-api_stats_commit_activity-4.json | 47 ++++++++++++
 .../mappings/user-1-68a31e.json               | 48 -------------
 .../testCommitActivity/mappings/user-1.json   | 48 +++++++++++++
 ...e.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...-org_github-api_stats_contributors-4.json} |  0
 ...5de-9b65-259e1fe4d673.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-4da8ec.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-6d11bb.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...ithub-api_stats_contributors-4-722ef7.json | 47 ------------
 ...t-org_github-api_stats_contributors-4.json | 47 ++++++++++++
 .../mappings/user-1-8442a6.json               | 48 -------------
 .../testContributorStats/mappings/user-1.json | 48 +++++++++++++
 ...7.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...117-86aa-da70544ee1bb.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-bc8f8b.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-7631fa.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...org_github-api_stats_participation-4.json} |  0
 .../mappings/user-1-a809af.json               | 48 -------------
 .../testParticipation/mappings/user-1.json    | 48 +++++++++++++
 ...8.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...st-org_github-api_stats_punch_card-4.json} |  0
 ...e37-a72e-7ffb584c1422.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-754abf.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-b2ea09.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ..._github-api_stats_punch_card-4-e401c5.json | 47 ------------
 ...est-org_github-api_stats_punch_card-4.json | 47 ++++++++++++
 .../testPunchCard/mappings/user-1-49e5cd.json | 48 -------------
 .../testPunchCard/mappings/user-1.json        | 48 +++++++++++++
 ...on => repos_kamontat_checkidnumber-2.json} |  0
 ...ntat_checkidnumber_releases_latest-3.json} |  0
 ...35c-98e0-3af8eafc960a.json => user-1.json} |  0
 ...repos_kamontat_checkidnumber-2-572d41.json | 48 -------------
 .../repos_kamontat_checkidnumber-2.json       | 48 +++++++++++++
 ...heckidnumber_releases_latest-3-d2547b.json | 48 -------------
 ...ontat_checkidnumber_releases_latest-3.json | 48 +++++++++++++
 .../mappings/user-1-b9c99a.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_kamontat_java8example-2.json} |  0
 ...0cd-94d2-72b47c9a4999.json => user-1.json} |  0
 .../repos_kamontat_java8example-2-7752c1.json | 48 -------------
 .../repos_kamontat_java8example-2.json        | 48 +++++++++++++
 ...ontat_java8example_releases_latest-3.json} |  0
 .../mappings/user-1-53c446.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...e.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...f72-9947-07df902f56c3.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-cb173a.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-0a4d7a.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-4-2c69d5.json | 54 --------------
 ...epos_github-api-test-org_github-api-4.json | 54 ++++++++++++++
 ...thub-api-test-org_github-api-5-1c529d.json | 50 -------------
 ...epos_github-api-test-org_github-api-5.json | 50 +++++++++++++
 .../archive/mappings/user-1-7f6e9a.json       | 48 -------------
 .../wiremock/archive/mappings/user-1.json     | 48 +++++++++++++
 ...test-org_temp-checkstargazerscount-2.json} |  0
 ...a05-87e8-932107fd594e.json => user-1.json} |  0
 ...rg_temp-checkstargazerscount-2-bd22f7.json | 45 ------------
 ...-test-org_temp-checkstargazerscount-2.json | 45 ++++++++++++
 .../mappings/user-1-ebb961.json               | 45 ------------
 .../checkStargazersCount/mappings/user-1.json | 45 ++++++++++++
 ...i-test-org_temp-checkwatcherscount-2.json} |  0
 ...439-b05b-645236cafd19.json => user-3.json} |  0
 .../orgs_github-api-test-org-1-05a87d.json    | 43 -----------
 .../mappings/orgs_github-api-test-org-1.json  | 43 +++++++++++
 ...-org_temp-checkwatcherscount-2-480b7f.json | 49 -------------
 ...pi-test-org_temp-checkwatcherscount-2.json | 49 +++++++++++++
 .../mappings/user-3-0f326a.json               | 45 ------------
 .../checkWatchersCount/mappings/user-3.json   | 45 ++++++++++++
 ...6.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...cc6-96b5-26eb391105de.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-cadf65.json    | 45 ------------
 .../mappings/orgs_github-api-test-org-2.json  | 45 ++++++++++++
 ...thub-api-test-org_github-api-3-228f03.json | 45 ------------
 ...epos_github-api-test-org_github-api-3.json | 45 ++++++++++++
 ...thub-api_branches_test_nonexistent-4.json} |  0
 .../mappings/user-1-87afc7.json               | 45 ------------
 .../mappings/user-1.json                      | 45 ++++++++++++
 ...d.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...github-api_branches_test_urlencode-4.json} |  0
 ...3ba-bee2-e5aa6863dcbc.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-5e8ae8.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-30364e.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...-api_branches_test_urlencode-4-ed8bf5.json | 47 ------------
 ..._github-api_branches_test_urlencode-4.json | 47 ++++++++++++
 .../mappings/user-1-c92cdb.json               | 48 -------------
 .../getBranch_URLEncoded/mappings/user-1.json | 48 +++++++++++++
 ...6127d19224.json => orgs_github-api-1.json} |  0
 ...son => repos_github-api_github-api-2.json} |  0
 ...8eb373c4e2e040f739df8b9_check-runs-3.json} |  0
 ...8eb373c4e2e040f739df8b9_check-runs-4.json} |  0
 ...8eb373c4e2e040f739df8b9_check-runs-5.json} |  0
 ...8eb373c4e2e040f739df8b9_check-runs-6.json} |  0
 ...8eb373c4e2e040f739df8b9_check-runs-7.json} |  0
 .../mappings/orgs_github-api-1-5d8b3f.json    | 44 ------------
 .../mappings/orgs_github-api-1.json           | 44 ++++++++++++
 .../repos_github-api_github-api-2-71c75c.json | 44 ------------
 .../repos_github-api_github-api-2.json        | 44 ++++++++++++
 ...c4e2e040f739df8b9_check-runs-3-6f217f.json | 47 ------------
 ...58eb373c4e2e040f739df8b9_check-runs-3.json | 47 ++++++++++++
 ...c4e2e040f739df8b9_check-runs-4-f57cb1.json | 46 ------------
 ...58eb373c4e2e040f739df8b9_check-runs-4.json | 46 ++++++++++++
 ...c4e2e040f739df8b9_check-runs-5-797b1c.json | 44 ------------
 ...58eb373c4e2e040f739df8b9_check-runs-5.json | 44 ++++++++++++
 ...c4e2e040f739df8b9_check-runs-6-1787ee.json | 44 ------------
 ...58eb373c4e2e040f739df8b9_check-runs-6.json | 44 ++++++++++++
 ...c4e2e040f739df8b9_check-runs-7-2c64eb.json | 44 ------------
 ...58eb373c4e2e040f739df8b9_check-runs-7.json | 44 ++++++++++++
 ...d.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...-test-org_github-api_collaborators-4.json} |  0
 ...587-884e-cf24228c088a.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-d319a1.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-4c1e8c.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...org_github-api_collaborators-4-2b8bad.json | 47 ------------
 ...i-test-org_github-api_collaborators-4.json | 47 ++++++++++++
 .../mappings/user-1-1fc40d.json               | 48 -------------
 .../getCollaborators/mappings/user-1.json     | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...f1c-9077-87f686c19718.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-94de53.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-99deb4.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 .../mappings/user-1-98b2b9.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...1.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...7c2-b875-0bb64784cf03.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-793c4c.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-6352b5.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...7f4e49f4f47625e6fc2b49f26bfc-4-a9d176.json | 47 ------------
 ...15eff597f4e49f4f47625e6fc2b49f26bfc-4.json | 47 ++++++++++++
 .../mappings/user-1-d332ba.json               | 48 -------------
 .../getLastCommitStatus/mappings/user-1.json  | 48 +++++++++++++
 ...-api-test-org_temp-getmergeoptions-2.json} |  0
 ...331-8808-0ca2781e48be.json => user-1.json} |  0
 ...est-org_temp-getmergeoptions-2-cb893c.json | 48 -------------
 ...b-api-test-org_temp-getmergeoptions-2.json | 48 +++++++++++++
 .../mappings/user-1-5d8fe2.json               | 48 -------------
 .../getMergeOptions/mappings/user-1.json      | 48 +++++++++++++
 ...a-a912b960c50c.json => orgs_apache-5.json} |  0
 ...1eb321.json => repos_apache_groovy-6.json} |  0
 ...ithub-api-test-org_test-permission-2.json} |  0
 ...sion_collaborators_dude_permission-4.json} |  0
 ...n_collaborators_kohsuke_permission-3.json} |  0
 ...af9-b88b-3a9f87603970.json => user-1.json} |  0
 .../mappings/orgs_apache-5-f737f0.json        | 48 -------------
 .../getPermission/mappings/orgs_apache-5.json | 48 +++++++++++++
 .../repos_apache_groovy-6-cc8d85.json         | 48 -------------
 .../mappings/repos_apache_groovy-6.json       | 48 +++++++++++++
 ...vy_collaborators_jglick_permission-7.json} |  0
 ...api-test-org_test-permission-2-4976af.json | 48 -------------
 ...github-api-test-org_test-permission-2.json | 48 +++++++++++++
 ...ollaborators_dude_permission-4-665c40.json | 47 ------------
 ...ssion_collaborators_dude_permission-4.json | 47 ++++++++++++
 ...aborators_kohsuke_permission-3-8dd9fa.json | 47 ------------
 ...on_collaborators_kohsuke_permission-3.json | 47 ++++++++++++
 .../getPermission/mappings/user-1-01e35a.json | 48 -------------
 .../getPermission/mappings/user-1.json        | 48 +++++++++++++
 ...8.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...c3e-a221-0825bbb912fc.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-4d7df9.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-14b99b.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...thub-api-test-org_github-api_hooks-4.json} |  0
 .../mappings/user-1-bd5a7a.json               | 48 -------------
 .../getPostCommitHooks/mappings/user-1.json   | 48 +++++++++++++
 ...s_github-api-test-org_temp-getrefs-2.json} |  0
 ...api-test-org_temp-getrefs_git_refs-3.json} |  0
 ...4c6-8ddb-03e4bf6ada41.json => user-1.json} |  0
 ...ub-api-test-org_temp-getrefs-2-b801c4.json | 48 -------------
 ...os_github-api-test-org_temp-getrefs-2.json | 48 +++++++++++++
 ...st-org_temp-getrefs_git_refs-3-75f99e.json | 49 -------------
 ...-api-test-org_temp-getrefs_git_refs-3.json | 49 +++++++++++++
 .../getRefs/mappings/user-1-5f3cda.json       | 48 -------------
 .../wiremock/getRefs/mappings/user-1.json     | 48 +++++++++++++
 ...api-test-org_temp-getrefsemptytags-2.json} |  0
 ...d9a-98bd-30c0891bed64.json => user-1.json} |  0
 ...st-org_temp-getrefsemptytags-2-9293d0.json | 48 -------------
 ...-api-test-org_temp-getrefsemptytags-2.json | 48 +++++++++++++
 ...emp-getrefsemptytags_git_refs_tags-3.json} |  0
 .../mappings/user-1-71dacb.json               | 48 -------------
 .../getRefsEmptyTags/mappings/user-1.json     | 48 +++++++++++++
 ...hub-api-test-org_temp-getrefsheads-2.json} |  0
 ...g_temp-getrefsheads_git_refs_heads-3.json} |  0
 ...4e6-8000-a0e52f469579.json => user-1.json} |  0
 ...i-test-org_temp-getrefsheads-2-7b70f1.json | 48 -------------
 ...thub-api-test-org_temp-getrefsheads-2.json | 48 +++++++++++++
 ...-getrefsheads_git_refs_heads-3-95cf2b.json | 49 -------------
 ...rg_temp-getrefsheads_git_refs_heads-3.json | 49 +++++++++++++
 .../getRefsHeads/mappings/user-1-4d2e3f.json  | 48 -------------
 .../getRefsHeads/mappings/user-1.json         | 48 +++++++++++++
 ...7.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...ba4-a6c0-d7b45353121f.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-f2bd68.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-c19ba5.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...thub-api_releases_tags_foo-bar-baz-4.json} |  0
 .../mappings/user-1-c36cc5.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...6-0b375b5d889c.json => orgs_github-2.json} |  0
 ...b17884999.json => repos_github_hub-3.json} |  0
 ...ithub_hub_releases_tags_v230-pre10-4.json} |  0
 ...dcb-b261-9ddd517c941a.json => user-1.json} |  0
 .../mappings/orgs_github-2-8cbc3a.json        | 48 -------------
 .../mappings/orgs_github-2.json               | 48 +++++++++++++
 .../mappings/repos_github_hub-3-fc5211.json   | 48 -------------
 .../mappings/repos_github_hub-3.json          | 48 +++++++++++++
 ...hub_releases_tags_v230-pre10-4-dcb217.json | 48 -------------
 ...github_hub_releases_tags_v230-pre10-4.json | 48 +++++++++++++
 .../mappings/user-1-87c44e.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...1-a4976502dc61.json => orgs_github-2.json} |  0
 ...86dcfbfde.json => repos_github_hub-3.json} |  0
 ...fef-ba8e-6747d1e1f89b.json => user-1.json} |  0
 .../mappings/orgs_github-2-18ee08.json        | 48 -------------
 .../mappings/orgs_github-2.json               | 48 +++++++++++++
 .../mappings/repos_github_hub-3-e0a029.json   | 48 -------------
 .../mappings/repos_github_hub-3.json          | 48 +++++++++++++
 ...b_hub_releases_9223372036854775807-4.json} |  0
 .../mappings/user-1-f64c26.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...3-144947461c8a.json => orgs_github-2.json} |  0
 ...d8e9e18c3.json => repos_github_hub-3.json} |  0
 ... repos_github_hub_releases_6839710-4.json} |  0
 ...682-98f0-dd715240d160.json => user-1.json} |  0
 .../mappings/orgs_github-2-f8d704.json        | 48 -------------
 .../mappings/orgs_github-2.json               | 48 +++++++++++++
 .../mappings/repos_github_hub-3-f5ba6b.json   | 48 -------------
 .../mappings/repos_github_hub-3.json          | 48 +++++++++++++
 ..._github_hub_releases_6839710-4-2959bf.json | 48 -------------
 .../repos_github_hub_releases_6839710-4.json  | 48 +++++++++++++
 .../mappings/user-1-37773e.json               | 48 -------------
 .../getReleaseExists/mappings/user-1.json     | 48 +++++++++++++
 ...b.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...-test-org_github-api_collaborators-4.json} |  0
 ...083-9fb0-94e698629c4e.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-5ebb43.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-65381e.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...org_github-api_collaborators-4-b0680d.json | 47 ------------
 ...i-test-org_github-api_collaborators-4.json | 47 ++++++++++++
 .../mappings/user-1-b9ef1f.json               | 48 -------------
 .../listCollaborators/mappings/user-1.json    | 48 +++++++++++++
 ...aaea191b89.json => orgs_github-api-2.json} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...github-api_github-api_contributors-4.json} |  0
 ...985-8e1f-b1e25b4ef547.json => user-1.json} |  0
 .../mappings/orgs_github-api-2-7c4b2a.json    | 48 -------------
 .../mappings/orgs_github-api-2.json           | 48 +++++++++++++
 .../repos_github-api_github-api-3-d87d95.json | 48 -------------
 .../repos_github-api_github-api-3.json        | 48 +++++++++++++
 ...-api_github-api_contributors-4-cd6221.json | 49 -------------
 ..._github-api_github-api_contributors-4.json | 49 +++++++++++++
 .../mappings/user-1-5705a1.json               | 48 -------------
 .../listContributors/mappings/user-1.json     | 48 +++++++++++++
 ...=> repos_github-api-test-org_empty-2.json} |  0
 ...d3e-9932-d48541155f86.json => user-1.json} |  0
 ...os_github-api-test-org_empty-2-af73e2.json | 48 -------------
 .../repos_github-api-test-org_empty-2.json    | 48 +++++++++++++
 ...ub-api-test-org_empty_contributors-3.json} |  0
 .../mappings/user-1-8d2ebb.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...54d-8498-f30d5e2ca5a2.json => user-1.json} |  0
 .../repos_github-api_github-api-2-1852eb.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...os_github-api_github-api_languages-3.json} |  0
 .../listLanguages/mappings/user-1-aab4cb.json | 48 -------------
 .../listLanguages/mappings/user-1.json        | 48 +++++++++++++
 ..._github-api-test-org_temp-listrefs-2.json} |  0
 ...pi-test-org_temp-listrefs_git_refs-3.json} |  0
 ...844-b014-67e67c77fb7a.json => user-1.json} |  0
 ...b-api-test-org_temp-listrefs-2-368c90.json | 48 -------------
 ...s_github-api-test-org_temp-listrefs-2.json | 48 +++++++++++++
 ...t-org_temp-listrefs_git_refs-3-efdb25.json | 49 -------------
 ...api-test-org_temp-listrefs_git_refs-3.json | 49 +++++++++++++
 .../listRefs/mappings/user-1-b4ac1b.json      | 48 -------------
 .../wiremock/listRefs/mappings/user-1.json    | 48 +++++++++++++
 ...pi-test-org_temp-listrefsemptytags-2.json} |  0
 ...98e-b1a4-7738966139d1.json => user-1.json} |  0
 ...t-org_temp-listrefsemptytags-2-fd0b43.json | 48 -------------
 ...api-test-org_temp-listrefsemptytags-2.json | 48 +++++++++++++
 ...mp-listrefsemptytags_git_refs_tags-3.json} |  0
 .../mappings/user-1-ddaa07.json               | 48 -------------
 .../listRefsEmptyTags/mappings/user-1.json    | 48 +++++++++++++
 ...ub-api-test-org_temp-listrefsheads-2.json} |  0
 ..._temp-listrefsheads_git_refs_heads-3.json} |  0
 ...e7b-b4d7-de0426c59757.json => user-1.json} |  0
 ...-test-org_temp-listrefsheads-2-41a762.json | 48 -------------
 ...hub-api-test-org_temp-listrefsheads-2.json | 48 +++++++++++++
 ...listrefsheads_git_refs_heads-3-1f4fd8.json | 49 -------------
 ...g_temp-listrefsheads_git_refs_heads-3.json | 49 +++++++++++++
 .../listRefsHeads/mappings/user-1-8da6cb.json | 48 -------------
 .../listRefsHeads/mappings/user-1.json        | 48 +++++++++++++
 ...7-0a3b1d9653e6.json => orgs_github-2.json} |  0
 ...4b08673be.json => repos_github_hub-3.json} |  0
 ....json => repos_github_hub_releases-4.json} |  0
 ...c01-bac9-fedbc8963616.json => user-1.json} |  0
 .../mappings/orgs_github-2-c4db4d.json        | 48 -------------
 .../listReleases/mappings/orgs_github-2.json  | 48 +++++++++++++
 .../mappings/repos_github_hub-3-833860.json   | 48 -------------
 .../mappings/repos_github_hub-3.json          | 48 +++++++++++++
 .../repos_github_hub_releases-4-5c5da4.json   | 48 -------------
 .../mappings/repos_github_hub_releases-4.json | 48 +++++++++++++
 .../listReleases/mappings/user-1-95be22.json  | 48 -------------
 .../listReleases/mappings/user-1.json         | 48 +++++++++++++
 ...3.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...ithub-api-test-org_github-api_tags-4.json} |  0
 ...son => repositories_206888201_tags-5.json} |  0
 ...son => repositories_206888201_tags-6.json} |  0
 ...b3e-8665-9766d40b5f75.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-02e4a8.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-490a14.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...api-test-org_github-api_tags-4-76fbf6.json | 49 -------------
 ...github-api-test-org_github-api_tags-4.json | 49 +++++++++++++
 .../repositories_206888201_tags-5-477fba.json | 49 -------------
 .../repositories_206888201_tags-5.json        | 49 +++++++++++++
 .../repositories_206888201_tags-6-4c548e.json | 49 -------------
 .../repositories_206888201_tags-6.json        | 49 +++++++++++++
 .../listTags/mappings/user-1-1be699.json      | 48 -------------
 .../wiremock/listTags/mappings/user-1.json    | 48 +++++++++++++
 ...ub-api-test-org_temp-listtagsempty-2.json} |  0
 ...d19-8716-8568f1bef559.json => user-1.json} |  0
 ...-test-org_temp-listtagsempty-2-13b321.json | 48 -------------
 ...hub-api-test-org_temp-listtagsempty-2.json | 48 +++++++++++++
 ...i-test-org_temp-listtagsempty_tags-3.json} |  0
 .../listTagsEmpty/mappings/user-1-f450f1.json | 48 -------------
 .../listTagsEmpty/mappings/user-1.json        | 48 +++++++++++++
 ...e-9bc9-2535b965c1ff.txt => markdown-4.txt} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...11d-b646-0a128e9b2aff.json => user-1.json} |  0
 .../markDown/mappings/markdown-4-82013a.json  | 47 ------------
 .../markDown/mappings/markdown-4.json         | 47 ++++++++++++
 ..._raw-2-44dcd2.json => markdown_raw-2.json} |  0
 .../repos_github-api_github-api-3-b97d0b.json | 48 -------------
 .../repos_github-api_github-api-3.json        | 48 +++++++++++++
 .../markDown/mappings/user-1-d7cf6a.json      | 48 -------------
 .../wiremock/markDown/mappings/user-1.json    | 48 +++++++++++++
 ...3fa65a.json => search_repositories-2.json} |  0
 ...612-a015-f97b98848847.json => user-1.json} |  0
 .../search_repositories-2-03ff4b.json         | 44 ------------
 .../mappings/search_repositories-2.json       | 44 ++++++++++++
 .../mappings/user-1-3b3417.json               | 48 -------------
 .../searchRepositories/mappings/user-1.json   | 48 +++++++++++++
 ...7.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...9bb-955e-0a0678e36010.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-377473.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-ff9f6e.json | 51 -------------
 ...epos_github-api-test-org_github-api-3.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-4-850c61.json | 54 --------------
 ...epos_github-api-test-org_github-api-4.json | 54 ++++++++++++++
 ...thub-api-test-org_github-api-5-c79f68.json | 51 -------------
 ...epos_github-api-test-org_github-api-5.json | 51 +++++++++++++
 ...thub-api-test-org_github-api-6-0e5ceb.json | 54 --------------
 ...epos_github-api-test-org_github-api-6.json | 54 ++++++++++++++
 ...thub-api-test-org_github-api-7-93f4b2.json | 50 -------------
 ...epos_github-api-test-org_github-api-7.json | 50 +++++++++++++
 .../mappings/user-1-1520ef.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...api-test-org_temp-setmergeoptions-10.json} |  0
 ...-api-test-org_temp-setmergeoptions-2.json} |  0
 ...-api-test-org_temp-setmergeoptions-3.json} |  0
 ...-api-test-org_temp-setmergeoptions-4.json} |  0
 ...-api-test-org_temp-setmergeoptions-5.json} |  0
 ...-api-test-org_temp-setmergeoptions-6.json} |  0
 ...-api-test-org_temp-setmergeoptions-7.json} |  0
 ...-api-test-org_temp-setmergeoptions-8.json} |  0
 ...-api-test-org_temp-setmergeoptions-9.json} |  0
 ...15d-96ff-d9c628b799f3.json => user-1.json} |  0
 ...st-org_temp-setmergeoptions-10-3c8120.json | 47 ------------
 ...-api-test-org_temp-setmergeoptions-10.json | 47 ++++++++++++
 ...est-org_temp-setmergeoptions-2-0d8d7e.json | 48 -------------
 ...b-api-test-org_temp-setmergeoptions-2.json | 48 +++++++++++++
 ...est-org_temp-setmergeoptions-3-3e3a54.json | 54 --------------
 ...b-api-test-org_temp-setmergeoptions-3.json | 54 ++++++++++++++
 ...est-org_temp-setmergeoptions-4-200ab5.json | 54 --------------
 ...b-api-test-org_temp-setmergeoptions-4.json | 54 ++++++++++++++
 ...est-org_temp-setmergeoptions-5-036019.json | 51 -------------
 ...b-api-test-org_temp-setmergeoptions-5.json | 51 +++++++++++++
 ...est-org_temp-setmergeoptions-6-4de721.json | 51 -------------
 ...b-api-test-org_temp-setmergeoptions-6.json | 51 +++++++++++++
 ...est-org_temp-setmergeoptions-7-265263.json | 54 --------------
 ...b-api-test-org_temp-setmergeoptions-7.json | 54 ++++++++++++++
 ...est-org_temp-setmergeoptions-8-d82ad1.json | 54 --------------
 ...b-api-test-org_temp-setmergeoptions-8.json | 54 ++++++++++++++
 ...est-org_temp-setmergeoptions-9-6224e0.json | 51 -------------
 ...b-api-test-org_temp-setmergeoptions-9.json | 51 +++++++++++++
 .../mappings/user-1-b42d20.json               | 48 -------------
 .../setMergeOptions/mappings/user-1.json      | 48 +++++++++++++
 ...0.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...9d6-abdf-bc5c3d6de17a.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-564bce.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-5861f3.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...i-test-org_github-api_subscription-4.json} |  0
 ...i-test-org_github-api_subscription-5.json} |  0
 ...i-test-org_github-api_subscription-6.json} |  0
 ...i-test-org_github-api_subscription-7.json} |  0
 .../subscription/mappings/user-1-77d1bd.json  | 48 -------------
 .../subscription/mappings/user-1.json         | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...pos_github-api_github-api_contents-3.json} |  0
 ...thub-api_github-api_contents_cname-4.json} |  0
 ...thub-api_contents_dependencieshtml-5.json} |  0
 ...ontents_dependency-convergencehtml-6.json} |  0
 ...b-api_contents_dependency-infohtml-7.json} |  0
 ...ntents_distribution-managementhtml-8.json} |  0
 ...-api_github-api_contents_indexhtml-9.json} |  0
 ...thub-api_contents_integrationhtml-10.json} |  0
 ...b-api_contents_issue-trackinghtml-11.json} |  0
 ...i_github-api_contents_licensehtml-12.json} |  0
 ...ithub-api_contents_mail-listshtml-13.json} |  0
 ...pi_contents_plugin-managementhtml-14.json} |  0
 ...i_github-api_contents_pluginshtml-15.json} |  0
 ...hub-api_contents_project-infohtml-16.json} |  0
 ...-api_contents_project-reportshtml-17.json} |  0
 ...-api_contents_project-summaryhtml-18.json} |  0
 ...pi_contents_source-repositoryhtml-19.json} |  0
 ...github-api_contents_team-listhtml-20.json} |  0
 ...17e-8ea0-ce0930482f4a.json => user-1.json} |  0
 .../repos_github-api_github-api-2-159ce7.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...thub-api_github-api_contents-3-07f37d.json | 48 -------------
 ...epos_github-api_github-api_contents-3.json | 48 +++++++++++++
 ...pi_github-api_contents_cname-4-7ccd6f.json | 48 -------------
 ...ithub-api_github-api_contents_cname-4.json | 48 +++++++++++++
 ...pi_contents_dependencieshtml-5-e65843.json | 48 -------------
 ...ithub-api_contents_dependencieshtml-5.json | 48 +++++++++++++
 ...s_dependency-convergencehtml-6-2711f4.json | 48 -------------
 ...contents_dependency-convergencehtml-6.json | 48 +++++++++++++
 ...contents_dependency-infohtml-7-b87956.json | 48 -------------
 ...ub-api_contents_dependency-infohtml-7.json | 48 +++++++++++++
 ..._distribution-managementhtml-8-8aba06.json | 48 -------------
 ...ontents_distribution-managementhtml-8.json | 48 +++++++++++++
 ...ithub-api_contents_indexhtml-9-699687.json | 48 -------------
 ...b-api_github-api_contents_indexhtml-9.json | 48 +++++++++++++
 ...pi_contents_integrationhtml-10-f6bbfa.json | 48 -------------
 ...ithub-api_contents_integrationhtml-10.json | 48 +++++++++++++
 ...contents_issue-trackinghtml-11-5be48b.json | 48 -------------
 ...ub-api_contents_issue-trackinghtml-11.json | 48 +++++++++++++
 ...ub-api_contents_licensehtml-12-e6c4a5.json | 48 -------------
 ...pi_github-api_contents_licensehtml-12.json | 48 +++++++++++++
 ...api_contents_mail-listshtml-13-9fa1b5.json | 48 -------------
 ...github-api_contents_mail-listshtml-13.json | 48 +++++++++++++
 ...tents_plugin-managementhtml-14-933e02.json | 48 -------------
 ...api_contents_plugin-managementhtml-14.json | 48 +++++++++++++
 ...ub-api_contents_pluginshtml-15-ee7e46.json | 48 -------------
 ...pi_github-api_contents_pluginshtml-15.json | 48 +++++++++++++
 ...i_contents_project-infohtml-16-eed0ad.json | 48 -------------
 ...thub-api_contents_project-infohtml-16.json | 48 +++++++++++++
 ...ontents_project-reportshtml-17-64d11c.json | 48 -------------
 ...b-api_contents_project-reportshtml-17.json | 48 +++++++++++++
 ...ontents_project-summaryhtml-18-c278dd.json | 48 -------------
 ...b-api_contents_project-summaryhtml-18.json | 48 +++++++++++++
 ...tents_source-repositoryhtml-19-dfae60.json | 48 -------------
 ...api_contents_source-repositoryhtml-19.json | 48 +++++++++++++
 ...-api_contents_team-listhtml-20-692982.json | 48 -------------
 ..._github-api_contents_team-listhtml-20.json | 48 +++++++++++++
 .../testIssue162/mappings/user-1-656249.json  | 48 -------------
 .../testIssue162/mappings/user-1.json         | 48 +++++++++++++
 ...ithub-api_gh-pages_dependencieshtml-2.txt} |  0
 ...gh-pages_dependency-convergencehtml-3.txt} |  0
 ...ub-api_gh-pages_dependency-infohtml-4.txt} |  0
 ...h-pages_distribution-managementhtml-5.txt} |  0
 ...b-api_github-api_gh-pages_indexhtml-6.txt} |  0
 ...github-api_gh-pages_integrationhtml-7.txt} |  0
 ...hub-api_gh-pages_issue-trackinghtml-8.txt} |  0
 ...api_github-api_gh-pages_licensehtml-9.txt} |  0
 ...github-api_gh-pages_mail-listshtml-10.txt} |  0
 ...api_gh-pages_plugin-managementhtml-11.txt} |  0
 ...pi_github-api_gh-pages_pluginshtml-12.txt} |  0
 ...thub-api_gh-pages_project-infohtml-13.txt} |  0
 ...b-api_gh-pages_project-reportshtml-14.txt} |  0
 ...b-api_gh-pages_project-summaryhtml-15.txt} |  0
 ...api_gh-pages_source-repositoryhtml-16.txt} |  0
 ..._github-api_gh-pages_team-listhtml-17.txt} |  0
 ...thub-api_github-api_gh-pages_cname-1.json} |  0
 ...pi_gh-pages_dependencieshtml-2-d0c5eb.json | 45 ------------
 ...ithub-api_gh-pages_dependencieshtml-2.json | 45 ++++++++++++
 ...s_dependency-convergencehtml-3-9eeed3.json | 45 ------------
 ...gh-pages_dependency-convergencehtml-3.json | 45 ++++++++++++
 ...gh-pages_dependency-infohtml-4-3ca718.json | 45 ------------
 ...ub-api_gh-pages_dependency-infohtml-4.json | 45 ++++++++++++
 ..._distribution-managementhtml-5-445a75.json | 45 ------------
 ...h-pages_distribution-managementhtml-5.json | 45 ++++++++++++
 ...ithub-api_gh-pages_indexhtml-6-462283.json | 45 ------------
 ...b-api_github-api_gh-pages_indexhtml-6.json | 45 ++++++++++++
 ...api_gh-pages_integrationhtml-7-92a899.json | 45 ------------
 ...github-api_gh-pages_integrationhtml-7.json | 45 ++++++++++++
 ..._gh-pages_issue-trackinghtml-8-77d917.json | 45 ------------
 ...hub-api_gh-pages_issue-trackinghtml-8.json | 45 ++++++++++++
 ...hub-api_gh-pages_licensehtml-9-833a65.json | 45 ------------
 ...api_github-api_gh-pages_licensehtml-9.json | 45 ++++++++++++
 ...api_gh-pages_mail-listshtml-10-497d36.json | 45 ------------
 ...github-api_gh-pages_mail-listshtml-10.json | 45 ++++++++++++
 ...pages_plugin-managementhtml-11-ee1451.json | 45 ------------
 ...api_gh-pages_plugin-managementhtml-11.json | 45 ++++++++++++
 ...ub-api_gh-pages_pluginshtml-12-80c8a1.json | 45 ------------
 ...pi_github-api_gh-pages_pluginshtml-12.json | 45 ++++++++++++
 ...i_gh-pages_project-infohtml-13-c17c46.json | 45 ------------
 ...thub-api_gh-pages_project-infohtml-13.json | 45 ++++++++++++
 ...h-pages_project-reportshtml-14-5367f0.json | 45 ------------
 ...b-api_gh-pages_project-reportshtml-14.json | 45 ++++++++++++
 ...h-pages_project-summaryhtml-15-604826.json | 45 ------------
 ...b-api_gh-pages_project-summaryhtml-15.json | 45 ++++++++++++
 ...pages_source-repositoryhtml-16-1548ed.json | 45 ------------
 ...api_gh-pages_source-repositoryhtml-16.json | 45 ++++++++++++
 ...-api_gh-pages_team-listhtml-17-15e841.json | 45 ------------
 ..._github-api_gh-pages_team-listhtml-17.json | 45 ++++++++++++
 ... repos_bitwiseman_test-repo-public-3.json} |  0
 ... repos_bitwiseman_test-repo-public-4.json} |  0
 ... repos_bitwiseman_test-repo-public-5.json} |  0
 ... repos_bitwiseman_test-repo-public-6.json} |  0
 ...a4d-89ab-8180ace9484c.json => user-1.json} |  0
 ...2d-74926a2b751e.json => user_repos-2.json} |  0
 ..._bitwiseman_test-repo-public-3-1c10db.json | 54 --------------
 .../repos_bitwiseman_test-repo-public-3.json  | 54 ++++++++++++++
 ..._bitwiseman_test-repo-public-4-a50794.json | 51 -------------
 .../repos_bitwiseman_test-repo-public-4.json  | 51 +++++++++++++
 ..._bitwiseman_test-repo-public-5-745213.json | 54 --------------
 .../repos_bitwiseman_test-repo-public-5.json  | 54 ++++++++++++++
 ..._bitwiseman_test-repo-public-6-5f1779.json | 50 -------------
 .../repos_bitwiseman_test-repo-public-6.json  | 50 +++++++++++++
 ... repos_bitwiseman_test-repo-public-7.json} |  0
 .../testSetPublic/mappings/user-1-e09de7.json | 48 -------------
 .../testSetPublic/mappings/user-1.json        | 48 +++++++++++++
 .../mappings/user_repos-2-d25ff0.json         | 55 --------------
 .../testSetPublic/mappings/user_repos-2.json  | 55 ++++++++++++++
 ...5.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...07d-b9aa-f7b00cdc8995.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-077497.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-6396d3.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...ub-api-test-org_github-api_topics-10.json} |  0
 ...ub-api-test-org_github-api_topics-11.json} |  0
 ...hub-api-test-org_github-api_topics-4.json} |  0
 ...hub-api-test-org_github-api_topics-5.json} |  0
 ...hub-api-test-org_github-api_topics-6.json} |  0
 ...hub-api-test-org_github-api_topics-7.json} |  0
 ...hub-api-test-org_github-api_topics-8.json} |  0
 ...hub-api-test-org_github-api_topics-9.json} |  0
 .../testSetTopics/mappings/user-1-489e21.json | 48 -------------
 .../testSetTopics/mappings/user-1.json        | 48 +++++++++++++
 ...8.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...b-api-test-org_github-api_git_refs-5.json} |  0
 ...b-api-test-org_github-api_git_tags-4.json} |  0
 ...f34-9f86-e811649e0ce1.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-d542cf.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-18a0b0.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...test-org_github-api_git_refs-5-f654b3.json | 55 --------------
 ...ub-api-test-org_github-api_git_refs-5.json | 55 ++++++++++++++
 ...test-org_github-api_git_tags-4-4af1f2.json | 55 --------------
 ...ub-api-test-org_github-api_git_tags-4.json | 55 ++++++++++++++
 .../testCreateTag/mappings/user-1-a8d3e5.json | 48 -------------
 .../testCreateTag/mappings/user-1.json        | 48 +++++++++++++
 ...4.json => orgs_github-api-test-org-2.json} |  0
 ...thub-api-test-org_teams_dummy-team-3.json} |  0
 ...thub-api-test-org_teams_dummy-team-5.json} |  0
 ...thub-api-test-org_teams_dummy-team-7.json} |  0
 ...da720a764dd6.json => teams_3451996-4.json} |  0
 ...6691f9bf180c.json => teams_3451996-6.json} |  0
 ...62f-955f-7fcb8535064e.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-3211df.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-2.json  | 46 ++++++++++++
 ...pi-test-org_teams_dummy-team-3-b23971.json | 49 -------------
 ...ithub-api-test-org_teams_dummy-team-3.json | 49 +++++++++++++
 ...pi-test-org_teams_dummy-team-5-32efe6.json | 49 -------------
 ...ithub-api-test-org_teams_dummy-team-5.json | 49 +++++++++++++
 ...pi-test-org_teams_dummy-team-7-32b16e.json | 48 -------------
 ...ithub-api-test-org_teams_dummy-team-7.json | 48 +++++++++++++
 .../mappings/teams_3451996-4-a86786.json      | 55 --------------
 .../mappings/teams_3451996-4.json             | 55 ++++++++++++++
 .../mappings/teams_3451996-6-de9b6c.json      | 55 --------------
 .../mappings/teams_3451996-6.json             | 55 ++++++++++++++
 .../mappings/user-1-fd7e48.json               | 46 ------------
 .../testSetDescription/mappings/user-1.json   | 46 ++++++++++++
 ...c.json => orgs_github-api-test-org-2.json} |  0
 ...thub-api-test-org_teams_dummy-team-3.json} |  0
 ...thub-api-test-org_teams_dummy-team-5.json} |  0
 ...thub-api-test-org_teams_dummy-team-7.json} |  0
 ...da31aae7519f.json => teams_3451996-4.json} |  0
 ...ecaa62c3b73b.json => teams_3451996-6.json} |  0
 ...98a-adc1-e63cacdd50cb.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-daa518.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-2.json  | 46 ++++++++++++
 ...pi-test-org_teams_dummy-team-3-2b6631.json | 49 -------------
 ...ithub-api-test-org_teams_dummy-team-3.json | 49 +++++++++++++
 ...pi-test-org_teams_dummy-team-5-47d338.json | 49 -------------
 ...ithub-api-test-org_teams_dummy-team-5.json | 49 +++++++++++++
 ...pi-test-org_teams_dummy-team-7-a73705.json | 48 -------------
 ...ithub-api-test-org_teams_dummy-team-7.json | 48 +++++++++++++
 .../mappings/teams_3451996-4-70263b.json      | 55 --------------
 .../mappings/teams_3451996-4.json             | 55 ++++++++++++++
 .../mappings/teams_3451996-6-51846d.json      | 55 --------------
 .../mappings/teams_3451996-6.json             | 55 ++++++++++++++
 .../mappings/user-1-ba4c37.json               | 46 ------------
 .../testSetPrivacy/mappings/user-1.json       | 46 ++++++++++++
 ...hub-api-test-org_ghtreebuildertest-2.json} |  0
 ...reebuildertest_contents_app_runsh-12.json} |  0
 ...buildertest_contents_data_val1dat-14.json} |  0
 ...buildertest_contents_data_val2dat-15.json} |  0
 ...uildertest_contents_doc_readmetxt-13.json} |  0
 ...org_ghtreebuildertest_git_commits-10.json} |  0
 ...buildertest_git_refs_heads_master-11.json} |  0
 ...ebuildertest_git_refs_heads_master-3.json} |  0
 ...st-org_ghtreebuildertest_git_trees-9.json} |  0
 ...ghtreebuildertest_git_trees_master-4.json} |  0
 ...149-8538-0facc0ebfcb2.json => user-1.json} |  0
 ...i-test-org_ghtreebuildertest-2-60eb06.json | 48 -------------
 ...thub-api-test-org_ghtreebuildertest-2.json | 48 +++++++++++++
 ...ldertest_contents_app_runsh-12-05a655.json | 48 -------------
 ...treebuildertest_contents_app_runsh-12.json | 48 +++++++++++++
 ...rtest_contents_data_val1dat-14-b093dc.json | 48 -------------
 ...ebuildertest_contents_data_val1dat-14.json | 48 +++++++++++++
 ...rtest_contents_data_val2dat-15-bbedc2.json | 48 -------------
 ...ebuildertest_contents_data_val2dat-15.json | 48 +++++++++++++
 ...test_contents_doc_readmetxt-13-5f0818.json | 48 -------------
 ...buildertest_contents_doc_readmetxt-13.json | 48 +++++++++++++
 ...st-org_ghtreebuildertest_git_blobs-5.json} |  0
 ...st-org_ghtreebuildertest_git_blobs-6.json} |  0
 ...st-org_ghtreebuildertest_git_blobs-7.json} |  0
 ...st-org_ghtreebuildertest_git_blobs-8.json} |  0
 ...treebuildertest_git_commits-10-aa6ff1.json | 55 --------------
 ...-org_ghtreebuildertest_git_commits-10.json | 55 ++++++++++++++
 ...rtest_git_refs_heads_master-11-e0c20f.json | 54 --------------
 ...ebuildertest_git_refs_heads_master-11.json | 54 ++++++++++++++
 ...ertest_git_refs_heads_master-3-add23d.json | 49 -------------
 ...eebuildertest_git_refs_heads_master-3.json | 49 +++++++++++++
 ..._ghtreebuildertest_git_trees-9-51f469.json | 55 --------------
 ...est-org_ghtreebuildertest_git_trees-9.json | 55 ++++++++++++++
 ...buildertest_git_trees_master-4-c5654f.json | 48 -------------
 ..._ghtreebuildertest_git_trees_master-4.json | 48 +++++++++++++
 .../testAdd/mappings/user-1-f77e84.json       | 48 -------------
 .../wiremock/testAdd/mappings/user-1.json     | 48 +++++++++++++
 ...hub-api-test-org_ghtreebuildertest-2.json} |  0
 ...buildertest_contents_data_val1dat-10.json} |  0
 ...buildertest_contents_data_val2dat-11.json} |  0
 ...-org_ghtreebuildertest_git_commits-8.json} |  0
 ...ebuildertest_git_refs_heads_master-3.json} |  0
 ...ebuildertest_git_refs_heads_master-9.json} |  0
 ...st-org_ghtreebuildertest_git_trees-7.json} |  0
 ...ghtreebuildertest_git_trees_master-4.json} |  0
 ...ece-ae75-623cb2b525b4.json => user-1.json} |  0
 ...i-test-org_ghtreebuildertest-2-f665d4.json | 48 -------------
 ...thub-api-test-org_ghtreebuildertest-2.json | 48 +++++++++++++
 ...rtest_contents_data_val1dat-10-33349f.json | 48 -------------
 ...ebuildertest_contents_data_val1dat-10.json | 48 +++++++++++++
 ...rtest_contents_data_val2dat-11-d4f752.json | 48 -------------
 ...ebuildertest_contents_data_val2dat-11.json | 48 +++++++++++++
 ...st-org_ghtreebuildertest_git_blobs-5.json} |  0
 ...st-org_ghtreebuildertest_git_blobs-6.json} |  0
 ...htreebuildertest_git_commits-8-31ea75.json | 55 --------------
 ...t-org_ghtreebuildertest_git_commits-8.json | 55 ++++++++++++++
 ...ertest_git_refs_heads_master-3-683572.json | 49 -------------
 ...eebuildertest_git_refs_heads_master-3.json | 49 +++++++++++++
 ...ertest_git_refs_heads_master-9-85167f.json | 54 --------------
 ...eebuildertest_git_refs_heads_master-9.json | 54 ++++++++++++++
 ..._ghtreebuildertest_git_trees-7-2c2c70.json | 55 --------------
 ...est-org_ghtreebuildertest_git_trees-7.json | 55 ++++++++++++++
 ...buildertest_git_trees_master-4-219353.json | 48 -------------
 ..._ghtreebuildertest_git_trees_master-4.json | 48 +++++++++++++
 .../testShaEntry/mappings/user-1-ef48e6.json  | 48 -------------
 .../testShaEntry/mappings/user-1.json         | 48 +++++++++++++
 ...375-8c32-7669b7dec98d.json => user-1.json} |  0
 ...a9-d7389c1774e9.json => user_repos-2.json} |  0
 ...7a3acaca2544.json => users_kohsuke-3.json} |  0
 ...suke_github-user-test-private-repo-4.json} |  0
 .../mappings/user-1-9c77ca.json               | 45 ------------
 .../mappings/user-1.json                      | 45 ++++++++++++
 .../mappings/user_repos-2-1c6314.json         | 52 --------------
 .../mappings/user_repos-2.json                | 52 ++++++++++++++
 .../mappings/users_kohsuke-3-f2bb88.json      | 45 ------------
 .../mappings/users_kohsuke-3.json             | 45 ++++++++++++
 ...-91b6dce384b5.json => users_rtyler-1.json} |  0
 ...9cdd0157.json => users_rtyler_keys-2.json} |  0
 .../mappings/users_rtyler-1-11f423.json       | 46 ------------
 .../getKeys/mappings/users_rtyler-1.json      | 46 ++++++++++++
 .../mappings/users_rtyler_keys-2-395dc0.json  | 45 ------------
 .../getKeys/mappings/users_rtyler_keys-2.json | 45 ++++++++++++
 ...064-80c5-8cfd1c50290f.json => user-1.json} |  0
 ...-cece79cb70d7.json => users_rtyler-2.json} |  0
 ...f87.json => users_rtyler_followers-3.json} |  0
 ...430.json => users_rtyler_following-4.json} |  0
 .../mappings/user-1-ca1c86.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 .../mappings/users_rtyler-2-b56699.json       | 48 -------------
 .../mappings/users_rtyler-2.json              | 48 +++++++++++++
 .../users_rtyler_followers-3-5d12f1.json      | 48 -------------
 .../mappings/users_rtyler_followers-3.json    | 48 +++++++++++++
 .../users_rtyler_following-4-51f792.json      | 48 -------------
 .../mappings/users_rtyler_following-4.json    | 48 +++++++++++++
 ...e6c-8b13-c3133fc2b1fd.json => user-1.json} |  0
 ...9995e7e3c.json => user_50003_repos-4.json} |  0
 ...b14f59a39.json => user_50003_repos-5.json} |  0
 ...f5e3664ba.json => user_50003_repos-6.json} |  0
 ...f4da86418bca.json => users_kohsuke-2.json} |  0
 ...6dcd86.json => users_kohsuke_repos-3.json} |  0
 .../mappings/user-1-905609.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 .../mappings/user_50003_repos-4-1eeb7b.json   | 48 -------------
 .../mappings/user_50003_repos-4.json          | 48 +++++++++++++
 .../mappings/user_50003_repos-5-d1c08a.json   | 48 -------------
 .../mappings/user_50003_repos-5.json          | 48 +++++++++++++
 .../mappings/user_50003_repos-6-1e91f1.json   | 48 -------------
 .../mappings/user_50003_repos-6.json          | 48 +++++++++++++
 .../mappings/users_kohsuke-2-da994e.json      | 48 -------------
 .../mappings/users_kohsuke-2.json             | 48 +++++++++++++
 .../users_kohsuke_repos-3-9f7b75.json         | 48 -------------
 .../mappings/users_kohsuke_repos-3.json       | 48 +++++++++++++
 ...421-9f2a-a4b7bde4c1a8.json => user-1.json} |  0
 ...99596d17b.json => user_50003_repos-4.json} |  0
 ...4d64c283688e.json => users_kohsuke-2.json} |  0
 ...fb4fd7.json => users_kohsuke_repos-3.json} |  0
 .../mappings/user-1-e80779.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 .../mappings/user_50003_repos-4-c1c1b7.json   | 48 -------------
 .../mappings/user_50003_repos-4.json          | 48 +++++++++++++
 .../mappings/users_kohsuke-2-f1828d.json      | 48 -------------
 .../mappings/users_kohsuke-2.json             | 48 +++++++++++++
 .../users_kohsuke_repos-3-24db0a.json         | 48 -------------
 .../mappings/users_kohsuke_repos-3.json       | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f09-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f09-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f09-3.json | 48 +++++++++++++
 .../testBadEmail/mappings/user-1-c247f8.json  | 48 -------------
 .../testBadEmail/mappings/user-1.json         | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f01-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f01-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f01-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../testExpiredKey/mappings/user-1.json       | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f03-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f03-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f03-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../testGpgverifyError/mappings/user-1.json   | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f04-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f04-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f04-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f12-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f12-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f12-3.json | 48 +++++++++++++
 .../testInvalid/mappings/user-1-c247f8.json   | 48 -------------
 .../wiremock/testInvalid/mappings/user-1.json | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f11-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f11-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f11-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f07-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f07-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f07-3.json | 48 +++++++++++++
 .../testNoUser/mappings/user-1-c247f8.json    | 48 -------------
 .../wiremock/testNoUser/mappings/user-1.json  | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f02-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f02-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f02-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../testNotSigningKey/mappings/user-1.json    | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f10-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f10-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f10-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../testUnknownKey/mappings/user-1.json       | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f06-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f06-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f06-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f05-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f05-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f05-3.json | 48 +++++++++++++
 .../testUnsigned/mappings/user-1-c247f8.json  | 48 -------------
 .../testUnsigned/mappings/user-1.json         | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f08-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f08-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f08-3.json | 48 +++++++++++++
 .../mappings/user-1-c247f8.json               | 48 -------------
 .../testUnverifiedEmail/mappings/user-1.json  | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...45aa6d71d54923655066049d9e21a15f13-3.json} |  0
 ...4e9-820a-0a91dc74ce98.json => user-1.json} |  0
 .../repos_github-api_github-api-2-441cdf.json | 48 -------------
 .../repos_github-api_github-api-2.json        | 48 +++++++++++++
 ...71d54923655066049d9e21a15f13-3-d76abe.json | 48 -------------
 ...245aa6d71d54923655066049d9e21a15f13-3.json | 48 +++++++++++++
 .../testValid/mappings/user-1-c247f8.json     | 48 -------------
 .../wiremock/testValid/mappings/user-1.json   | 48 +++++++++++++
 ...8a-43bd-9d37-d0851f8699bf.json => -1.json} |  0
 .../mappings/-1-2ce6df.json                   | 45 ------------
 .../testGitHubIsApiUrlValid/mappings/-1.json  | 45 ++++++++++++
 ...aac-ad1a-502d7abd8050.json => meta-1.json} |  0
 .../getMeta/mappings/meta-1-d75466.json       | 45 ------------
 .../wiremock/getMeta/mappings/meta-1.json     | 45 ++++++++++++
 ...r-marketplace_purchases-stubbed-eVWvD.json | 67 ++++++++---------
 ...9b3cb4f74bd.json => organizations-11.json} |  0
 ...1bdb02b270a.json => organizations-14.json} |  0
 ...eb2e59c0c90a.json => organizations-2.json} |  0
 ...9f4dd64508ac.json => organizations-5.json} |  0
 ...e69ecb693956.json => organizations-8.json} |  0
 ...659507.json => orgs_collectiveidea-7.json} |  0
 ...fe1723286f.json => orgs_engineyard-4.json} |  0
 ...da264635250.json => orgs_entryway-12.json} |  0
 ...-1804f5db66af.json => orgs_errfree-3.json} |  0
 ...84-0aaec71bbb8a.json => orgs_merb-13.json} |  0
 ...4068.json => orgs_ministrycentered-6.json} |  0
 ...921b5bb3.json => orgs_moneyspyder-15.json} |  0
 ...b2cb-ff6291d00223.json => orgs_ogc-9.json} |  0
 ...5644e401c7.json => orgs_sevenwire-10.json} |  0
 ...d36e5b0513a.json => orgs_sproutit-16.json} |  0
 ...d25-846d-7d1e2dd2500e.json => user-1.json} |  0
 .../mappings/organizations-11-0fccda.json     | 48 -------------
 .../getOrgs/mappings/organizations-11.json    | 48 +++++++++++++
 .../mappings/organizations-14-003deb.json     | 48 -------------
 .../getOrgs/mappings/organizations-14.json    | 48 +++++++++++++
 .../mappings/organizations-2-025896.json      | 48 -------------
 .../getOrgs/mappings/organizations-2.json     | 48 +++++++++++++
 .../mappings/organizations-5-4ef810.json      | 48 -------------
 .../getOrgs/mappings/organizations-5.json     | 48 +++++++++++++
 .../mappings/organizations-8-19d13a.json      | 48 -------------
 .../getOrgs/mappings/organizations-8.json     | 48 +++++++++++++
 .../orgs_collectiveidea-7-4bbf97.json         | 48 -------------
 .../mappings/orgs_collectiveidea-7.json       | 48 +++++++++++++
 .../mappings/orgs_engineyard-4-643eb5.json    | 48 -------------
 .../getOrgs/mappings/orgs_engineyard-4.json   | 48 +++++++++++++
 .../mappings/orgs_entryway-12-e1bd91.json     | 48 -------------
 .../getOrgs/mappings/orgs_entryway-12.json    | 48 +++++++++++++
 .../mappings/orgs_errfree-3-63eb86.json       | 48 -------------
 .../getOrgs/mappings/orgs_errfree-3.json      | 48 +++++++++++++
 .../getOrgs/mappings/orgs_merb-13-df20cc.json | 48 -------------
 .../getOrgs/mappings/orgs_merb-13.json        | 48 +++++++++++++
 .../orgs_ministrycentered-6-40a544.json       | 48 -------------
 .../mappings/orgs_ministrycentered-6.json     | 48 +++++++++++++
 .../mappings/orgs_moneyspyder-15-859aaf.json  | 48 -------------
 .../getOrgs/mappings/orgs_moneyspyder-15.json | 48 +++++++++++++
 .../getOrgs/mappings/orgs_ogc-9-7ba44d.json   | 48 -------------
 .../wiremock/getOrgs/mappings/orgs_ogc-9.json | 48 +++++++++++++
 .../mappings/orgs_sevenwire-10-2a01f6.json    | 48 -------------
 .../getOrgs/mappings/orgs_sevenwire-10.json   | 48 +++++++++++++
 .../mappings/orgs_sproutit-16-a165de.json     | 48 -------------
 .../getOrgs/mappings/orgs_sproutit-16.json    | 48 +++++++++++++
 .../getOrgs/mappings/user-1-d7829e.json       | 48 -------------
 .../wiremock/getOrgs/mappings/user-1.json     | 48 +++++++++++++
 ...51b-a0ee-d8fe7f04e8a1.json => user-1.json} |  0
 ...a7-9eff-c74efd7221c0.json => users-2.json} |  0
 ...60cb43f69f8.json => users_brynary-12.json} |  0
 ...43d1b92eeb42.json => users_defunkt-4.json} |  0
 ...eb3a2565fc89.json => users_evanphx-9.json} |  0
 ...8d8946b08e1.json => users_ezmobius-7.json} |  0
 ...84-b9dbaea2d27b.json => users_ivey-8.json} |  0
 ...363d73c6fc1d.json => users_mojombo-3.json} |  0
 ...bcfdf1031af2.json => users_pjhyett-5.json} |  0
 ...997f1139396.json => users_vanpelt-10.json} |  0
 ...372ba4.json => users_wayneeseguin-11.json} |  0
 ...-6b87d8d79b6a.json => users_wycats-6.json} |  0
 .../listUsers/mappings/user-1-83656a.json     | 48 -------------
 .../wiremock/listUsers/mappings/user-1.json   | 48 +++++++++++++
 .../listUsers/mappings/users-2-c2940d.json    | 48 -------------
 .../wiremock/listUsers/mappings/users-2.json  | 48 +++++++++++++
 .../mappings/users_brynary-12-87de93.json     | 48 -------------
 .../listUsers/mappings/users_brynary-12.json  | 48 +++++++++++++
 .../mappings/users_defunkt-4-14f04e.json      | 48 -------------
 .../listUsers/mappings/users_defunkt-4.json   | 48 +++++++++++++
 .../mappings/users_evanphx-9-bb2fea.json      | 48 -------------
 .../listUsers/mappings/users_evanphx-9.json   | 48 +++++++++++++
 .../mappings/users_ezmobius-7-2e9ea7.json     | 48 -------------
 .../listUsers/mappings/users_ezmobius-7.json  | 48 +++++++++++++
 .../mappings/users_ivey-8-2220ec.json         | 48 -------------
 .../listUsers/mappings/users_ivey-8.json      | 48 +++++++++++++
 .../mappings/users_mojombo-3-41ed06.json      | 48 -------------
 .../listUsers/mappings/users_mojombo-3.json   | 48 +++++++++++++
 .../mappings/users_pjhyett-5-41b461.json      | 48 -------------
 .../listUsers/mappings/users_pjhyett-5.json   | 48 +++++++++++++
 .../mappings/users_vanpelt-10-900a0e.json     | 48 -------------
 .../listUsers/mappings/users_vanpelt-10.json  | 48 +++++++++++++
 .../users_wayneeseguin-11-3e6233.json         | 48 -------------
 .../mappings/users_wayneeseguin-11.json       | 48 +++++++++++++
 .../mappings/users_wycats-6-b5f8d0.json       | 48 -------------
 .../listUsers/mappings/users_wycats-6.json    | 48 +++++++++++++
 ..._contents_src_attributes_classesjs-3.json} |  0
 ...d-490cadc9923a.json => search_code-2.json} |  0
 ...c3d-a630-00f934483deb.json => user-1.json} |  0
 ...nts_src_attributes_classesjs-3-d7ab2e.json | 48 -------------
 ...4_contents_src_attributes_classesjs-3.json | 48 +++++++++++++
 .../mappings/search_code-2-8ebadd.json        | 43 -----------
 .../searchContent/mappings/search_code-2.json | 43 +++++++++++
 .../searchContent/mappings/user-1-d3b1f3.json | 48 -------------
 .../searchContent/mappings/user-1.json        | 48 +++++++++++++
 ...-215b38b51121.json => search_users-2.json} |  0
 ...4e3-a93a-9584aa8bfe0d.json => user-1.json} |  0
 ...4f937c2a5cb1.json => users_mojombo-3.json} |  0
 .../mappings/search_users-2-0ca094.json       | 43 -----------
 .../searchUsers/mappings/search_users-2.json  | 43 +++++++++++
 .../searchUsers/mappings/user-1-76f627.json   | 48 -------------
 .../wiremock/searchUsers/mappings/user-1.json | 48 +++++++++++++
 .../mappings/users_mojombo-3-6e29c6.json      | 48 -------------
 .../searchUsers/mappings/users_mojombo-3.json | 48 +++++++++++++
 ...-0453ab408e59.json => repositories-2.json} |  0
 ...-055f864faad2.json => repositories-3.json} |  0
 ...1d0-86a0-7cf31d34af75.json => user-1.json} |  0
 .../mappings/repositories-2-7bda3d.json       | 48 -------------
 .../mappings/repositories-2.json              | 48 +++++++++++++
 .../mappings/repositories-3-85ebe3.json       | 48 -------------
 .../mappings/repositories-3.json              | 48 +++++++++++++
 .../mappings/user-1-9eed57.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...9b9e0a05de5.json => authorizations-1.json} |  0
 .../mappings/authorizations-1-4b8125.json     | 45 ------------
 .../mappings/authorizations-1.json            | 45 ++++++++++++
 ...4f71bf61db2.json => authorizations-2.json} |  0
 ...ns-1-cdda4d.json => authorizations-1.json} |  0
 .../mappings/authorizations-2-3f50c6.json     | 52 --------------
 .../mappings/authorizations-2.json            | 52 ++++++++++++++
 ...test-org_temp-testcreaterepository-2.json} |  0
 ...g_temp-testcreaterepository_issues-5.json} |  0
 ...mp-testcreaterepository_milestones-4.json} |  0
 ...temp-testcreaterepository_releases-6.json} |  0
 ...temp-testcreaterepository_releases-7.json} |  0
 ...pository_releases_21786739_assets-10.json} |  0
 ...epository_releases_21786739_assets-8.json} |  0
 ...epository_releases_assets_16422841-9.json} |  0
 ...0c2-a910-3a3e54f81865.json => user-1.json} |  0
 ...rg_temp-testcreaterepository-2-7e3d08.json | 48 -------------
 ...-test-org_temp-testcreaterepository-2.json | 48 +++++++++++++
 ...-testcreaterepository_issues-5-606626.json | 55 --------------
 ...rg_temp-testcreaterepository_issues-5.json | 55 ++++++++++++++
 ...tcreaterepository_milestones-4-c1bb69.json | 55 --------------
 ...emp-testcreaterepository_milestones-4.json | 55 ++++++++++++++
 ...temp-testcreaterepository_releases-3.json} |  0
 ...estcreaterepository_releases-6-dc00c2.json | 55 --------------
 ..._temp-testcreaterepository_releases-6.json | 55 ++++++++++++++
 ...estcreaterepository_releases-7-dc82f3.json | 49 -------------
 ..._temp-testcreaterepository_releases-7.json | 49 +++++++++++++
 ...ry_releases_21786739_assets-10-ed473c.json | 50 -------------
 ...epository_releases_21786739_assets-10.json | 50 +++++++++++++
 ...pository_releases_21786739_assets-12.json} |  0
 ...ory_releases_21786739_assets-8-42bb60.json | 50 -------------
 ...repository_releases_21786739_assets-8.json | 50 +++++++++++++
 ...pository_releases_assets_16422841-11.json} |  0
 ...ory_releases_assets_16422841-9-7f61d0.json | 55 --------------
 ...repository_releases_assets_16422841-9.json | 55 ++++++++++++++
 .../mappings/user-1-864ebe.json               | 48 -------------
 .../testCreateRepository/mappings/user-1.json | 48 +++++++++++++
 ...epository_releases_21786739_assets-1.json} |  0
 ...ory_releases_21786739_assets-1-3069f0.json | 46 ------------
 ...repository_releases_21786739_assets-1.json | 46 ++++++++++++
 ...org_temp-testratelimithandler_fail-3.json} |  0
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 ...mp-testratelimithandler_fail-3-574da1.json | 50 -------------
 ...-org_temp-testratelimithandler_fail-3.json | 50 +++++++++++++
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../testHandler_Fail/mappings/user-1.json     | 48 +++++++++++++
 ...org_temp-testratelimithandler_fail-3.json} |  0
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 ...mp-testratelimithandler_fail-3-574da1.json | 50 -------------
 ...-org_temp-testratelimithandler_fail-3.json | 50 +++++++++++++
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...org_temp-testratelimithandler_fail-3.json} |  0
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 ...mp-testratelimithandler_fail-3-574da1.json | 50 -------------
 ...-org_temp-testratelimithandler_fail-3.json | 50 +++++++++++++
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../testHandler_Wait/mappings/user-1.json     | 48 +++++++++++++
 ...f86-af3d-cab0d609c7b2.json => user-1.json} |  0
 ...org_temp-testratelimithandler_fail-2.json} |  0
 .../mappings/user-1-a60baf.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...25a84b963e.json => orgs_github-api-2.json} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...thub-api_github-api_traffic_clones-4.json} |  0
 ...6b4-aa97-2e712ef5f1d3.json => user-1.json} |  0
 .../mappings/orgs_github-api-2-88d717.json    | 48 -------------
 .../mappings/orgs_github-api-2.json           | 48 +++++++++++++
 .../repos_github-api_github-api-3-3e4826.json | 48 -------------
 .../repos_github-api_github-api-3.json        | 48 +++++++++++++
 ...pi_github-api_traffic_clones-4-08a276.json | 47 ------------
 ...ithub-api_github-api_traffic_clones-4.json | 47 ++++++++++++
 .../testGetClones/mappings/user-1-b88f84.json | 48 -------------
 .../testGetClones/mappings/user-1.json        | 48 +++++++++++++
 ...5.json => orgs_github-api-test-org-1.json} |  0
 ...pos_github-api-test-org_github-api-2.json} |  0
 ...faa-9747-ba5ce1ca2462.json => user-5.json} |  0
 .../orgs_github-api-test-org-1-cc28e4.json    | 46 ------------
 .../mappings/orgs_github-api-test-org-1.json  | 46 ++++++++++++
 ...thub-api-test-org_github-api-2-3e1a60.json | 46 ------------
 ...epos_github-api-test-org_github-api-2.json | 46 ++++++++++++
 ...test-org_github-api_traffic_clones-4.json} |  0
 ...-test-org_github-api_traffic_views-3.json} |  0
 .../mappings/user-5-bc05b9.json               | 48 -------------
 .../mappings/user-5.json                      | 48 +++++++++++++
 ...13f458c49e.json => orgs_github-api-2.json} |  0
 ...son => repos_github-api_github-api-3.json} |  0
 ...ithub-api_github-api_traffic_views-4.json} |  0
 ...071-89ac-e588ce9cc9fc.json => user-1.json} |  0
 .../mappings/orgs_github-api-2-193105.json    | 48 -------------
 .../mappings/orgs_github-api-2.json           | 48 +++++++++++++
 .../repos_github-api_github-api-3-266803.json | 48 -------------
 .../repos_github-api_github-api-3.json        | 48 +++++++++++++
 ...api_github-api_traffic_views-4-1b9b0f.json | 47 ------------
 ...github-api_github-api_traffic_views-4.json | 47 ++++++++++++
 .../testGetViews/mappings/user-1-45a8ae.json  | 48 -------------
 .../testGetViews/mappings/user-1.json         | 48 +++++++++++++
 ....json => orgs_github-api-test-org-11.json} |  0
 ....json => orgs_github-api-test-org-12.json} |  0
 ....json => orgs_github-api-test-org-13.json} |  0
 ....json => orgs_github-api-test-org-14.json} |  0
 ....json => orgs_github-api-test-org-15.json} |  0
 ....json => orgs_github-api-test-org-16.json} |  0
 ....json => orgs_github-api-test-org-18.json} |  0
 ...2.json => orgs_github-api-test-org-2.json} |  0
 ....json => orgs_github-api-test-org-20.json} |  0
 ....json => orgs_github-api-test-org-21.json} |  0
 ....json => orgs_github-api-test-org-22.json} |  0
 ....json => orgs_github-api-test-org-23.json} |  0
 ....json => orgs_github-api-test-org-24.json} |  0
 ....json => orgs_github-api-test-org-25.json} |  0
 ....json => orgs_github-api-test-org-27.json} |  0
 ...8.json => orgs_github-api-test-org-3.json} |  0
 ...3.json => orgs_github-api-test-org-4.json} |  0
 ...2.json => orgs_github-api-test-org-5.json} |  0
 ...9.json => orgs_github-api-test-org-6.json} |  0
 ...9.json => orgs_github-api-test-org-7.json} |  0
 ...f.json => orgs_github-api-test-org-9.json} |  0
 ...ccd-992e-e11223b55091.json => user-1.json} |  0
 ...98-bf3f-e89fa280bced.json => user-10.json} |  0
 ...bf-8f09-87612eb625c7.json => user-17.json} |  0
 ...6a-b5f6-c0d3a966b529.json => user-19.json} |  0
 ...1c-8624-c024e0d637a0.json => user-26.json} |  0
 ...b5a-91b7-720423ae348d.json => user-8.json} |  0
 .../orgs_github-api-test-org-11-5b634f.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-11.json | 51 +++++++++++++
 .../orgs_github-api-test-org-12-29f32c.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-12.json | 51 +++++++++++++
 .../orgs_github-api-test-org-13-181966.json   | 52 --------------
 .../mappings/orgs_github-api-test-org-13.json | 52 ++++++++++++++
 .../orgs_github-api-test-org-14-11c34a.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-14.json | 51 +++++++++++++
 .../orgs_github-api-test-org-15-41b780.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-15.json | 51 +++++++++++++
 .../orgs_github-api-test-org-16-6c31e6.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-16.json | 51 +++++++++++++
 .../orgs_github-api-test-org-18-b58aab.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-18.json | 51 +++++++++++++
 .../orgs_github-api-test-org-2-2207e2.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-20-1697d1.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-20.json | 51 +++++++++++++
 .../orgs_github-api-test-org-21-ab4543.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-21.json | 51 +++++++++++++
 .../orgs_github-api-test-org-22-a56b2a.json   | 52 --------------
 .../mappings/orgs_github-api-test-org-22.json | 52 ++++++++++++++
 .../orgs_github-api-test-org-23-e9b925.json   | 52 --------------
 .../mappings/orgs_github-api-test-org-23.json | 52 ++++++++++++++
 .../orgs_github-api-test-org-24-aed0ad.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-24.json | 51 +++++++++++++
 .../orgs_github-api-test-org-25-0c314f.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-25.json | 51 +++++++++++++
 .../orgs_github-api-test-org-27-87ba7d.json   | 50 -------------
 .../mappings/orgs_github-api-test-org-27.json | 50 +++++++++++++
 .../orgs_github-api-test-org-3-679857.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-3.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-4-26564f.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-4.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-5-e8bcc9.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-5.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-6-e1da68.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-6.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-7-dbc7af.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-7.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-9-3ff83a.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-9.json  | 51 +++++++++++++
 .../mappings/user-1-733192.json               | 52 --------------
 .../mappings/user-1.json                      | 52 ++++++++++++++
 .../mappings/user-10-2fd80c.json              | 51 -------------
 .../mappings/user-10.json                     | 51 +++++++++++++
 .../mappings/user-17-944cef.json              | 51 -------------
 .../mappings/user-17.json                     | 51 +++++++++++++
 .../mappings/user-19-bfd48b.json              | 51 -------------
 .../mappings/user-19.json                     | 51 +++++++++++++
 .../mappings/user-26-f66a5d.json              | 50 -------------
 .../mappings/user-26.json                     | 50 +++++++++++++
 .../mappings/user-8-b8119a.json               | 51 -------------
 .../mappings/user-8.json                      | 51 +++++++++++++
 ...3.json => orgs_github-api-test-org-2.json} |  0
 ...246-acce-600f3271d30d.json => user-1.json} |  0
 ...318-b2fc-555134913ada.json => user-3.json} |  0
 ...477-9ccf-5264e6e47d68.json => user-5.json} |  0
 .../orgs_github-api-test-org-2-622cfe.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...> orgs_github-api-test-org-missing-4.json} |  0
 ...> orgs_github-api-test-org-missing-6.json} |  0
 .../mappings/user-1-701c4d.json               | 51 -------------
 .../mappings/user-1.json                      | 51 +++++++++++++
 .../mappings/user-3-541087.json               | 51 -------------
 .../mappings/user-3.json                      | 51 +++++++++++++
 .../mappings/user-5-8ce0df.json               | 50 -------------
 .../mappings/user-5.json                      | 50 +++++++++++++
 ....json => orgs_github-api-test-org-10.json} |  0
 ....json => orgs_github-api-test-org-12.json} |  0
 ....json => orgs_github-api-test-org-13.json} |  0
 ....json => orgs_github-api-test-org-15.json} |  0
 ...c.json => orgs_github-api-test-org-2.json} |  0
 ...7.json => orgs_github-api-test-org-3.json} |  0
 ...4.json => orgs_github-api-test-org-5.json} |  0
 ...9.json => orgs_github-api-test-org-7.json} |  0
 ...5.json => orgs_github-api-test-org-8.json} |  0
 ...dac-9f9c-48145c86cec0.json => user-1.json} |  0
 ...c4-aee4-e5df36b88ce7.json => user-11.json} |  0
 ...ef-83be-438d573acced.json => user-14.json} |  0
 ...2ab-91cf-bd308ca9780b.json => user-4.json} |  0
 ...ec5-af6f-242f9529066c.json => user-6.json} |  0
 ...b9e-b3a1-80d3b86455a2.json => user-9.json} |  0
 .../orgs_github-api-test-org-10-2cd18b.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-10.json | 51 +++++++++++++
 .../orgs_github-api-test-org-12-5efe6d.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-12.json | 51 +++++++++++++
 .../orgs_github-api-test-org-13-553b71.json   | 51 -------------
 .../mappings/orgs_github-api-test-org-13.json | 51 +++++++++++++
 .../orgs_github-api-test-org-15-2a62d2.json   | 50 -------------
 .../mappings/orgs_github-api-test-org-15.json | 50 +++++++++++++
 .../orgs_github-api-test-org-2-62ca86.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-3-466537.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-3.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-5-ff502c.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-5.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-7-06661c.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-7.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-8-8f46cc.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-8.json  | 51 +++++++++++++
 .../mappings/user-1-c3924d.json               | 51 -------------
 .../mappings/user-1.json                      | 51 +++++++++++++
 .../mappings/user-11-03f5d1.json              | 51 -------------
 .../mappings/user-11.json                     | 51 +++++++++++++
 .../mappings/user-14-d81fbd.json              | 50 -------------
 .../mappings/user-14.json                     | 50 +++++++++++++
 .../mappings/user-4-816c95.json               | 51 -------------
 .../mappings/user-4.json                      | 51 +++++++++++++
 .../mappings/user-6-28c110.json               | 51 -------------
 .../mappings/user-6.json                      | 51 +++++++++++++
 .../mappings/user-9-6e140e.json               | 51 -------------
 .../mappings/user-9.json                      | 51 +++++++++++++
 ...7.json => orgs_github-api-test-org-2.json} |  0
 ...8.json => orgs_github-api-test-org-4.json} |  0
 ...c01-942b-1dbe62c37828.json => user-1.json} |  0
 ...53d-93f3-3a95646e5e49.json => user-3.json} |  0
 .../orgs_github-api-test-org-2-c4f47d.json    | 51 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 51 +++++++++++++
 .../orgs_github-api-test-org-4-b23279.json    | 50 -------------
 .../mappings/orgs_github-api-test-org-4.json  | 50 +++++++++++++
 .../mappings/user-1-6e1f23.json               | 51 -------------
 .../mappings/user-1.json                      | 51 +++++++++++++
 .../mappings/user-3-ec7ea0.json               | 50 -------------
 .../mappings/user-3.json                      | 50 +++++++++++++
 ...d.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...g_github-api_branches_test_timeout-4.json} |  0
 ...3ba-bee2-e5aa6863dcbc.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-5e8ae8.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-30364e.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...ub-api_branches_test_timeout-4-ed8bf5.json | 47 ------------
 ...rg_github-api_branches_test_timeout-4.json | 47 ++++++++++++
 .../mappings/user-1-c92cdb.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...d.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...g_github-api_branches_test_timeout-4.json} |  0
 ...3ba-bee2-e5aa6863dcbc.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-5e8ae8.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-30364e.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...ub-api_branches_test_timeout-4-ed8bf5.json | 47 ------------
 ...rg_github-api_branches_test_timeout-4.json | 47 ++++++++++++
 .../mappings/user-1-c92cdb.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...d.json => orgs_github-api-test-org-2.json} |  0
 ...pos_github-api-test-org_github-api-3.json} |  0
 ...g_github-api_branches_test_timeout-4.json} |  0
 ...3ba-bee2-e5aa6863dcbc.json => user-1.json} |  0
 .../orgs_github-api-test-org-2-5e8ae8.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-2.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-3-30364e.json | 48 -------------
 ...epos_github-api-test-org_github-api-3.json | 48 +++++++++++++
 ...ub-api_branches_test_timeout-4-ed8bf5.json | 47 ------------
 ...rg_github-api_branches_test_timeout-4.json | 47 ++++++++++++
 .../mappings/user-1-c92cdb.json               | 48 -------------
 .../mappings/user-1.json                      | 48 +++++++++++++
 ...son => repos_github-api_github-api-2.json} |  0
 ...88f-802f-35e51d3ba5b3.json => user-1.json} |  0
 .../repos_github-api_github-api-2-0a3444.json | 43 -----------
 .../repos_github-api_github-api-2.json        | 43 +++++++++++
 .../mappings/user-1-b4b6d5.json               | 43 -----------
 .../mappings/user-1.json                      | 43 +++++++++++
 ...a0a-98ea-626565e977ca.json => user-1.json} |  0
 .../mappings/user-1-67d218.json               | 43 -----------
 .../mappings/user-1.json                      | 43 +++++++++++
 ...6.json => orgs_github-api-test-org-3.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...-api-test-org_github-api_git_refs-12.json} |  0
 ...b5d-863e-ac84adf7a090.json => user-1.json} |  0
 ...a38-9faf-f238b715e9ac.json => user-2.json} |  0
 .../orgs_github-api-test-org-3-18671a.json    | 48 -------------
 .../mappings/orgs_github-api-test-org-3.json  | 48 +++++++++++++
 ...thub-api-test-org_github-api-4-dac6a9.json | 48 -------------
 ...epos_github-api-test-org_github-api-4.json | 48 +++++++++++++
 ...est-org_github-api_git_refs-12-ae6bc9.json | 57 ---------------
 ...b-api-test-org_github-api_git_refs-12.json | 57 +++++++++++++++
 ...b-api-test-org_github-api_git_refs-6.json} |  0
 ...refs_heads_test_content_ref_cache-10.json} |  0
 ...refs_heads_test_content_ref_cache-11.json} |  0
 ...refs_heads_test_content_ref_cache-13.json} |  0
 ...refs_heads_test_content_ref_cache-14.json} |  0
 ...refs_heads_test_content_ref_cache-15.json} |  0
 ..._refs_heads_test_content_ref_cache-7.json} |  0
 ..._refs_heads_test_content_ref_cache-8.json} |  0
 ..._refs_heads_test_content_ref_cache-9.json} |  0
 ...pi_git_refs_heads_test_unmergeable-5.json} |  0
 .../testCached404/mappings/user-1-0e4fff.json | 51 -------------
 .../testCached404/mappings/user-1.json        | 51 +++++++++++++
 .../testCached404/mappings/user-2-ba9eb8.json | 50 -------------
 .../testCached404/mappings/user-2.json        | 50 +++++++++++++
 ...6.json => orgs_github-api-test-org-3.json} |  0
 ...39-f32ed5f24d40.json => rate_limit-2.json} |  0
 ...os_github-api-test-org_github-api-10.json} |  0
 ...os_github-api-test-org_github-api-11.json} |  0
 ...os_github-api-test-org_github-api-12.json} |  0
 ...os_github-api-test-org_github-api-13.json} |  0
 ...os_github-api-test-org_github-api-14.json} |  0
 ...os_github-api-test-org_github-api-15.json} |  0
 ...os_github-api-test-org_github-api-16.json} |  0
 ...os_github-api-test-org_github-api-17.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...pos_github-api-test-org_github-api-8.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...cb5-ae17-49108689843a.json => user-1.json} |  0
 .../orgs_github-api-test-org-3-735e82.json    | 43 -----------
 .../mappings/orgs_github-api-test-org-3.json  | 43 +++++++++++
 .../mappings/rate_limit-2-56a454.json         | 38 ----------
 .../mappings/rate_limit-2.json                | 38 ++++++++++
 ...hub-api-test-org_github-api-10-ca8e64.json | 46 ------------
 ...pos_github-api-test-org_github-api-10.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-11-065820.json | 46 ------------
 ...pos_github-api-test-org_github-api-11.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-12-af0497.json | 46 ------------
 ...pos_github-api-test-org_github-api-12.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-13-52d2b8.json | 46 ------------
 ...pos_github-api-test-org_github-api-13.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-14-cec253.json | 46 ------------
 ...pos_github-api-test-org_github-api-14.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-15-1ed5a8.json | 46 ------------
 ...pos_github-api-test-org_github-api-15.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-16-b529a2.json | 46 ------------
 ...pos_github-api-test-org_github-api-16.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-17-e79386.json | 45 ------------
 ...pos_github-api-test-org_github-api-17.json | 45 ++++++++++++
 ...thub-api-test-org_github-api-4-cafca8.json | 46 ------------
 ...epos_github-api-test-org_github-api-4.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-5-1f9c12.json | 46 ------------
 ...epos_github-api-test-org_github-api-5.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-6-ce1bc2.json | 46 ------------
 ...epos_github-api-test-org_github-api-6.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-7-bcd9c4.json | 46 ------------
 ...epos_github-api-test-org_github-api-7.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-8-5f0013.json | 46 ------------
 ...epos_github-api-test-org_github-api-8.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-9-931c2b.json | 49 -------------
 ...epos_github-api-test-org_github-api-9.json | 49 +++++++++++++
 .../mappings/user-1-b52386.json               | 43 -----------
 .../DefaultConnector/mappings/user-1.json     | 43 +++++++++++
 ...0.json => orgs_github-api-test-org-3.json} |  0
 ...95-c2cdced6b84a.json => rate_limit-2.json} |  0
 ...os_github-api-test-org_github-api-10.json} |  0
 ...os_github-api-test-org_github-api-14.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...185-b143-ec3f21495fa6.json => user-1.json} |  0
 .../orgs_github-api-test-org-3-ec2931.json    | 43 -----------
 .../mappings/orgs_github-api-test-org-3.json  | 43 +++++++++++
 .../mappings/rate_limit-2-36588a.json         | 38 ----------
 .../mappings/rate_limit-2.json                | 38 ++++++++++
 ...-api-test-org_github-api-10-10-5432b2.json | 46 ------------
 ..._github-api-test-org_github-api-10-10.json | 46 ++++++++++++
 ...github-api-test-org_github-api-11-11.json} |  0
 ...github-api-test-org_github-api-12-12.json} |  0
 ...github-api-test-org_github-api-13-13.json} |  0
 ...-api-test-org_github-api-14-14-7e396e.json | 51 -------------
 ..._github-api-test-org_github-api-14-14.json | 51 +++++++++++++
 ...github-api-test-org_github-api-15-15.json} |  0
 ...github-api-test-org_github-api-16-16.json} |  0
 ...github-api-test-org_github-api-17-17.json} |  0
 ...ub-api-test-org_github-api-4-4-b99f84.json | 46 ------------
 ...os_github-api-test-org_github-api-4-4.json | 46 ++++++++++++
 ...s_github-api-test-org_github-api-5-5.json} |  0
 ...s_github-api-test-org_github-api-6-6.json} |  0
 ...s_github-api-test-org_github-api-7-7.json} |  0
 ...s_github-api-test-org_github-api-8-8.json} |  0
 ...ub-api-test-org_github-api-9-9-0db057.json | 49 -------------
 ...os_github-api-test-org_github-api-9-9.json | 49 +++++++++++++
 .../mappings/user-1-5dbb2b.json               | 43 -----------
 .../mappings/user-1.json                      | 43 +++++++++++
 ...3.json => orgs_github-api-test-org-3.json} |  0
 ...c4-1b0c2ecf6f85.json => rate_limit-2.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...a46-bc43-aeccd3eef451.json => user-1.json} |  0
 .../orgs_github-api-test-org-3-1d3815.json    | 43 -----------
 .../mappings/orgs_github-api-test-org-3.json  | 43 +++++++++++
 .../mappings/rate_limit-2-b23929.json         | 38 ----------
 .../mappings/rate_limit-2.json                | 38 ++++++++++
 ...thub-api-test-org_github-api-4-ec57e1.json | 46 ------------
 ...epos_github-api-test-org_github-api-4.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-5-82db63.json | 49 -------------
 ...epos_github-api-test-org_github-api-5.json | 49 +++++++++++++
 ...thub-api-test-org_github-api-6-02d53c.json | 45 ------------
 ...epos_github-api-test-org_github-api-6.json | 45 ++++++++++++
 .../mappings/user-1-d95886.json               | 43 -----------
 .../mappings/user-1.json                      | 43 +++++++++++
 ...b.json => orgs_github-api-test-org-3.json} |  0
 ...62-0163e5910625.json => rate_limit-2.json} |  0
 ...os_github-api-test-org_github-api-10.json} |  0
 ...os_github-api-test-org_github-api-11.json} |  0
 ...os_github-api-test-org_github-api-12.json} |  0
 ...os_github-api-test-org_github-api-13.json} |  0
 ...os_github-api-test-org_github-api-14.json} |  0
 ...os_github-api-test-org_github-api-15.json} |  0
 ...os_github-api-test-org_github-api-16.json} |  0
 ...os_github-api-test-org_github-api-17.json} |  0
 ...pos_github-api-test-org_github-api-4.json} |  0
 ...pos_github-api-test-org_github-api-5.json} |  0
 ...pos_github-api-test-org_github-api-6.json} |  0
 ...pos_github-api-test-org_github-api-7.json} |  0
 ...pos_github-api-test-org_github-api-8.json} |  0
 ...pos_github-api-test-org_github-api-9.json} |  0
 ...ed4-92d0-73795dac7985.json => user-1.json} |  0
 .../orgs_github-api-test-org-3-82590d.json    | 43 -----------
 .../mappings/orgs_github-api-test-org-3.json  | 43 +++++++++++
 .../mappings/rate_limit-2-e76bb3.json         | 38 ----------
 .../mappings/rate_limit-2.json                | 38 ++++++++++
 ...hub-api-test-org_github-api-10-d7826a.json | 46 ------------
 ...pos_github-api-test-org_github-api-10.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-11-144773.json | 46 ------------
 ...pos_github-api-test-org_github-api-11.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-12-49fce6.json | 46 ------------
 ...pos_github-api-test-org_github-api-12.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-13-31849f.json | 46 ------------
 ...pos_github-api-test-org_github-api-13.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-14-8a71a8.json | 46 ------------
 ...pos_github-api-test-org_github-api-14.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-15-e6a8cc.json | 46 ------------
 ...pos_github-api-test-org_github-api-15.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-16-1ec048.json | 46 ------------
 ...pos_github-api-test-org_github-api-16.json | 46 ++++++++++++
 ...hub-api-test-org_github-api-17-3e8ef8.json | 45 ------------
 ...pos_github-api-test-org_github-api-17.json | 45 ++++++++++++
 ...thub-api-test-org_github-api-4-99fb84.json | 46 ------------
 ...epos_github-api-test-org_github-api-4.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-5-57466b.json | 46 ------------
 ...epos_github-api-test-org_github-api-5.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-6-766326.json | 46 ------------
 ...epos_github-api-test-org_github-api-6.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-7-720bd2.json | 46 ------------
 ...epos_github-api-test-org_github-api-7.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-8-50e14b.json | 46 ------------
 ...epos_github-api-test-org_github-api-8.json | 46 ++++++++++++
 ...thub-api-test-org_github-api-9-703fd1.json | 49 -------------
 ...epos_github-api-test-org_github-api-9.json | 49 +++++++++++++
 .../mappings/user-1-754481.json               | 43 -----------
 .../mappings/user-1.json                      | 43 +++++++++++
 4203 files changed, 66036 insertions(+), 65960 deletions(-)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/{repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json => repos_github-api-test-org_temp-testratelimithandler_fail-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/{repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json => repos_github-api-test-org_temp-testratelimithandler_fail-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/{repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json => repos_github-api-test-org_temp-testratelimithandler_fail-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/{repos_github-api_github-api-db8eacb0-947c-4677-9780-1c1d1b8383eb.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/{repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8.txt => repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.txt} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/{repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-72e1ca23-1f03-45b5-90a2-e6dd6467b2f9.json => repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/{user-8996d059-e95f-4604-a534-b734e99d9e15.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2-db8eac.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3-6408bc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4-72e1ca.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1-8996d0.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/{repos_jenkinsci_jenkins-448d3f92-8488-4c5c-a81b-ca22a6039b39.json => repos_jenkinsci_jenkins-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/{repos_jenkinsci_jenkins_contents_core-7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7.json => repos_jenkinsci_jenkins_contents_core-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/{repos_jenkinsci_jenkins_contents_core_src-0566ab8b-d260-47cb-a6e6-fafa6fc2836c.json => repos_jenkinsci_jenkins_contents_core_src-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/{user-0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2-448d3f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3-7e1b6c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4-0566ab.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1-0cdbd9.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/{user-8636c5bc-5f1d-45cf-8182-9e7926d5231e.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/{user_memberships_orgs-29d7ac4b-573b-4044-a2b8-470ac1bf6335.json => user_memberships_orgs-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1-8636c5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2-29d7ac.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-a979348d-c6be-4cb7-8877-7c42a6f013ae.json => notifications-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-89714ed3-235b-4914-86a8-44ad66d59f30.json => notifications-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-2b718339-36d3-4c6b-9484-79cdd79a79e4.json => notifications-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-989db4b3-8dde-4065-b4ef-6a2d90a2753a.json => notifications-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-50b907ef-a983-4cc9-bfd2-e2ba76eae729.json => notifications-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-f2648b73-4af1-4be3-a2a4-9edc712c5d59.json => notifications-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-ee5a6c9f-da3a-47e7-a393-b403e82ae5d9.json => notifications-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-a41aeecf-7097-4ac6-b857-ab14797afe0a.json => notifications-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-e1d519f7-9bd2-4fcd-a288-2391944ec7ca.json => notifications-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-1b694852-8043-418c-a76e-39370f22db96.json => notifications-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-d85867b0-1efe-43f5-bdf4-1b9aef03ef55.json => notifications-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-48908278-ce2f-4cec-8662-6f4ca3d81226.json => notifications-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-42be6527-0570-4353-b42f-d0cae80258e3.json => notifications-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-5720c49c-c69b-495b-b7e6-b885d88c10b1.json => notifications-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-045c369a-0818-455a-afe1-3ae9ec919af2.json => notifications-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-bfc7733f-6dff-4675-81e9-926103c40b83.json => notifications-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-ac22e3e2-f0d3-4ff1-af23-23e9c79c725c.json => notifications-26.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-d9617266-1ca6-44b2-b495-52c1f3be4b91.json => notifications-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-6dea5253-3aa2-4484-b97a-effcad5c6ebd.json => notifications-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-a8e9449d-b78c-4e46-801e-59fc459920d3.json => notifications-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-2658e99a-6619-4b0b-b70f-814a0841839e.json => notifications-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-f2524684-5156-4db6-97fa-10dedac5f779.json => notifications-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-9437189d-2f1b-47de-898d-66fde88ef05b.json => notifications-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{notifications-1de52522-e900-4b19-90cd-758573c2349a.json => notifications-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/{user-8439ce2a-f18e-4395-9e5c-21604abb77ec.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10-a97934.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11-89714e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12-2b7183.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13-989db4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14-50b907.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15-f2648b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16-ee5a6c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17-a41aee.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18-e1d519.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19-1b6948.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2-d85867.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20-489082.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21-42be65.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22-5720c4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23-045c36.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24-bfc773.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26-ac22e3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3-d96172.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4-6dea52.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5-a8e944.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6-2658e9.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7-f25246.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8-943718.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9-1de525.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/{notifications_threads_523050578-25-3b5fa2.json => notifications_threads_523050578-25.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1-8439ce.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api-66f6b3ba-129b-441c-9f2f-c9e18c941eea.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311-1e8e21ad-edaf-4647-b812-4046b8f71a3a.json => repos_github-api_github-api_issues_311-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-1a36428c-ce04-4580-b160-ffc42b4629ff.json => repos_github-api_github-api_issues_311_reactions-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-41bca581-4ce9-4d1a-94ee-407bb996afc8.json => repos_github-api_github-api_issues_311_reactions-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-ec5b4512-28c1-46fe-95d2-710c6da55cb3.json => repos_github-api_github-api_issues_311_reactions-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-39f59d4e-7875-4b75-a093-97a0b4e7239b.json => repos_github-api_github-api_issues_311_reactions-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec.json => repos_github-api_github-api_issues_311_reactions-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-dfcc4bc3-3276-408a-a945-e132d4fbf2e5.json => repos_github-api_github-api_issues_311_reactions-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-e6be4fe8-bb46-418f-bd08-dba996ef250c.json => repos_github-api_github-api_issues_311_reactions-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-d9de8255-dcbc-409d-b311-b7824a3ddeb6.json => repos_github-api_github-api_issues_311_reactions-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{repos_github-api_github-api_issues_311_reactions-9904f18c-def2-4249-b64c-956a2d12f2bd.json => repos_github-api_github-api_issues_311_reactions-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/{user-d9a254e0-d5e1-4fd9-b995-51e933b769f3.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/{reactions_63220302-6-b59615.json => reactions_63220302-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/{reactions_63220303-13-cf170d.json => reactions_63220303-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/{reactions_63220305-14-dcbdbe.json => reactions_63220305-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/{reactions_63220306-15-08b50a.json => reactions_63220306-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/{reactions_63220307-16-12cbca.json => reactions_63220307-16.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2-66f6b3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3-1e8e21.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10-1a3642.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11-41bca5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12-ec5b45.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17-e6be4f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4-a94639.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5-dfcc4b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7-39f59d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8-d9de82.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9-9904f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1-d9a254.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/{orgs_jenkinsci-0d9fbee0-4b68-47c0-a981-105ca1998d9a.json => orgs_jenkinsci-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/{user-1f8ee76d-944b-4d35-953f-e99ef59186eb.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/{users_b-6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50.json => users_b-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/{users_kohsuke-6fc7a54e-d15d-4275-a7aa-396937282c09.json => users_kohsuke-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2-0d9fbe.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/{orgs_jenkinsci_members_b-6-ee4228.json => orgs_jenkinsci_members_b-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/{orgs_jenkinsci_members_kohsuke-5-073028.json => orgs_jenkinsci_members_kohsuke-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/{orgs_jenkinsci_public_members_b-8-fde843.json => orgs_jenkinsci_public_members_b-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/{orgs_jenkinsci_public_members_kohsuke-7-0da2da.json => orgs_jenkinsci_public_members_kohsuke-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1-1f8ee7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4-6d6a6b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3-6fc7a5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{repos_jenkinsci_jenkins-f502af71-7b74-4106-a246-1728b2c761ec.json => repos_jenkinsci_jenkins-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-c46f8ba9-3382-4afd-95b4-5efe98749e1d.json => repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-8ff72064-9c69-42c5-b00f-8fd6d21af7f7.json => repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-ba22502f-be39-4226-bf77-729b8fe2351a.json => repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-d30d6520-52dd-4f0c-9254-59fcdd4eeb86.json => repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{user-bddf3899-0de4-49c5-af35-56e5b63ef972.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/{users_jenkinsci-0eb97309-f0ae-460d-9fbe-f091372110eb.json => users_jenkinsci-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3-f502af.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4-c46f8b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5-8ff720.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/{repos_jenkinsci_jenkins_git_blobs_187cdf651cbf44196886f87327dc3968443174fb-7-176ac3.json => repos_jenkinsci_jenkins_git_blobs_187cdf651cbf44196886f87327dc3968443174fb-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8-ba2250.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6-d30d65.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1-bddf38.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2-0eb973.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/{repos_jenkinsci_jenkins-fe185aa7-c9e7-44d3-86e9-fd751abcf0d7.json => repos_jenkinsci_jenkins-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/{repos_jenkinsci_jenkins_comments-c4ee8bf9-1fc1-4535-ac30-f4133283e22f.json => repos_jenkinsci_jenkins_comments-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/{user-b9ac0eab-6dd1-4c7a-84fa-bf39e150869d.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/{users_jenkinsci-2443ea59-c39e-4dbc-8e5d-4f0330abb3dd.json => users_jenkinsci-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3-fe185a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4-c4ee8b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1-b9ac0e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2-2443ea.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-016aa7d1-f62e-49e2-9be0-34111d49b832.json => repos_github-api_github-api-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-061d63fb-a9bd-4d26-836d-9261dd42930d.json => repos_github-api_github-api-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-0b1ed97e-e317-43be-848e-3710f427cc76.json => repos_github-api_github-api-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-11236d5f-f9ac-46bc-8df5-74a3c0530d01.json => repos_github-api_github-api-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-1772651c-10b1-4cf8-9ed1-84ff1ab391be.json => repos_github-api_github-api-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-1c2b0dc9-c393-4356-93ed-0dbf29eaa073.json => repos_github-api_github-api-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-1dc4cd7d-3dda-4b61-881d-53f0f9f396da.json => repos_github-api_github-api-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-2449929f-f645-478c-a200-84c46cd27f6a.json => repos_github-api_github-api-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16.json => repos_github-api_github-api-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-25933563-afb5-46c5-86d8-40bcd4afdc54.json => repos_github-api_github-api-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-288d443b-fb97-49a0-85ec-b384c81e5c29.json => repos_github-api_github-api-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-2b956666-2508-4e00-ad10-91f6f465d3b6.json => repos_github-api_github-api-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6.json => repos_github-api_github-api-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-39b4cc7b-9408-4469-94b3-91dcc8adf81b.json => repos_github-api_github-api-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-3c19ad8d-5e22-48d0-9622-b89de17225a5.json => repos_github-api_github-api-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-3da25c77-0a96-46f4-b48c-ca514e84349e.json => repos_github-api_github-api-25.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-46e796bd-5015-48c3-9b4b-954a846a5aa3.json => repos_github-api_github-api-26.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-480308a6-e401-4c55-9963-107907d3ac39.json => repos_github-api_github-api-27.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-50679dd0-df4e-432b-85fa-bc3f72980bb3.json => repos_github-api_github-api-28.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-5765a28a-f754-4986-be30-e9016247083c.json => repos_github-api_github-api-29.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-59105db7-b5a8-452b-9530-6d1828515426.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-598ba839-d205-49d9-a035-ef234f6664a2.json => repos_github-api_github-api-30.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-5f2792cf-918e-4737-bc45-c253be138496.json => repos_github-api_github-api-31.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-5f4c645c-c4ea-4d46-afd6-2bab121b6a19.json => repos_github-api_github-api-32.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-68d3a2e3-9145-47b2-bdf4-7bd97aa73888.json => repos_github-api_github-api-34.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-68f868af-ba3c-4215-a7a8-b1270cbbce4f.json => repos_github-api_github-api-35.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-69de9951-24b6-4611-a4ee-59ba945a3f40.json => repos_github-api_github-api-36.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-70bc8011-2466-4bba-97f7-abd03bbc5ba3.json => repos_github-api_github-api-37.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-738e2f15-638d-4242-8662-c0416946339c.json => repos_github-api_github-api-38.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-7d831041-a17e-4591-b3e9-98e66530cdf9.json => repos_github-api_github-api-39.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-7d942646-69e0-4427-a560-971b1acaa32d.json => repos_github-api_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-89902ceb-d28f-4282-887b-5a9b163f3c7f.json => repos_github-api_github-api-40.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-8dd6b062-3e66-4047-9dff-989e7f229f29.json => repos_github-api_github-api-41.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-8eeab8d2-aad7-42a5-a940-b57cab9fe3ec.json => repos_github-api_github-api-42.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-918f6018-f314-4a29-8cab-29ff0eb56771.json => repos_github-api_github-api-43.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-91a31faf-a765-4032-9ab2-572dc9c75442.json => repos_github-api_github-api-44.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-93f9887a-c450-44be-8e98-1abec0784450.json => repos_github-api_github-api-45.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-9aecf306-8cc6-4b59-8d59-ef635dde8692.json => repos_github-api_github-api-46.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-a11d115c-2e43-4565-8097-e504023c904b.json => repos_github-api_github-api-47.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-a1c9b077-4fda-48b7-892f-87952aac7a53.json => repos_github-api_github-api-48.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-a217bdca-af93-42db-9189-440c435acdb0.json => repos_github-api_github-api-49.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8.json => repos_github-api_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-c300b8a5-ba5f-4c83-9a48-fb12a355f23e.json => repos_github-api_github-api-50.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-c363dc3e-d01d-40ee-8858-6df8433e4697.json => repos_github-api_github-api-51.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-c4fbb565-2111-4817-86f3-e5598f391a6c.json => repos_github-api_github-api-52.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-c56228ec-bb80-431a-853d-2da082c0c524.json => repos_github-api_github-api-53.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-c68776fa-2888-40be-b35d-7f5dc29de9c8.json => repos_github-api_github-api-54.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-c80963b9-e025-41c3-b58c-05e05b668635.json => repos_github-api_github-api-55.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-ce3916ac-a5ba-4f3b-a28f-fbcb451822df.json => repos_github-api_github-api-56.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-d52fd23a-7f97-41db-8361-02119185c8cf.json => repos_github-api_github-api-57.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-d578ab70-40b9-48a1-8cd3-18d8e5b17a71.json => repos_github-api_github-api-58.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-d7c5093b-fde1-44e2-9c99-b951a1af1f8b.json => repos_github-api_github-api-59.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-d7fec78a-8d2f-49af-92f9-a647a90190ff.json => repos_github-api_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-db288d44-d417-4fcc-b1a6-4fa1d1fd0764.json => repos_github-api_github-api-60.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-dc6c74e4-526f-4707-b50e-42ad3933c40a.json => repos_github-api_github-api-61.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-df143360-27af-463f-9d79-8c257992e7a8.json => repos_github-api_github-api-62.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-e0294eea-1425-4dbf-82f7-44cf6ec78634.json => repos_github-api_github-api-63.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-f7ed8103-6fcb-4fc6-8fc8-3a2581841897.json => repos_github-api_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-fb9346a5-515a-441e-a3aa-900b89888fb1.json => repos_github-api_github-api-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api-fe73af36-08b9-4e1c-8aa5-77c6489f2e2c.json => repos_github-api_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-5380cece-177e-4cf9-b842-8fcce67d9528.json => repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{search_commits-44b5b3a8-cb76-4cd7-8b0f-762f81037dac.json => search_commits-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{search_commits-c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb.json => search_commits-33.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/{user-726152f6-effe-47f0-b092-29d86ff46ef5.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10-177265.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11-480308.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12-39b4cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13-59105d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14-a1c9b0.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15-918f60.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16-738e2f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17-259335.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18-9aecf3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19-fb9346.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20-89902c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21-1c2b0d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22-5f2792.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23-68f868.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24-3da25c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25-5765a2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26-fe73af.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27-a11d11.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28-c4fbb5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29-7d8310.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3-c68776.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30-c300b8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31-c363dc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32-5f4c64.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34-1dc4cd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35-598ba8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36-d7fec7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37-24a9c4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38-11236d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39-a4f2d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4-db288d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40-d578ab.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41-8eeab8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42-8dd6b0.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43-50679d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44-d7c509.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45-f7ed81.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46-46e796.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47-ce3916.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48-3c19ad.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49-2b9566.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5-34380f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50-061d63.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51-244992.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52-69de99.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53-df1433.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54-c80963.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55-68d3a2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56-0b1ed9.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57-016aa7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58-e0294e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59-d52fd2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6-91a31f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60-93f988.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61-288d44.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62-c56228.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63-70bc80.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7-7d9426.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8-dc6c74.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9-a217bd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64-5380ce.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2-c94d38.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33-44b5b3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1-726152.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/{repos_github-api_github-api-b3932679-d938-421c-83c8-321c611cda12.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/{repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-6fad91ab-a75a-4968-b2cf-9b6edd71ee36.json => repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/{user-83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2-b39326.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3-6fad91.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1-83b4bb.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/{repos_github-api-test-org_github-api-test-31a86a0d-5120-47b8-a9bc-ec4b34a08080.json => repos_github-api-test-org_github-api-test-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/{repos_github-api-test-org_github-api-test_deployments-702b7123-86c1-41e0-bee7-f3cb89a3236d.json => repos_github-api-test-org_github-api-test_deployments-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/{repos_github-api-test-org_github-api-test_deployments-b4bcdadb-a708-4509-9382-479f300eb172.json => repos_github-api-test-org_github-api-test_deployments-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/{user-6d2dcbf4-4abf-4180-9b55-ca2931ca31c5.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2-31a86a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3-702b71.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4-b4bcda.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1-6d2dcb.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/{repos_kohsuke_sandbox-ant-3fd5d206-9d71-4f2a-bc95-605c06b6f793.json => repos_kohsuke_sandbox-ant-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/{repos_kohsuke_sandbox-ant_comments_35673784-70a63f41-02d3-404e-af0b-8e1c3cd00494.json => repos_kohsuke_sandbox-ant_comments_35673784-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/{repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-d1822d1b-5505-42ae-ba1d-ae0496d76c19.json => repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/{repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-62d11eb1-6045-42a7-988a-aae9d9f3800b.json => repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/{user-a9b48b44-c9ff-4434-9f98-64195b0c46ce.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/{users_kohsuke-a4924f94-0b1c-4cb0-bf1f-595ccb78aa41.json => users_kohsuke-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3-3fd5d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6-70a63f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/{repos_kohsuke_sandbox-ant_comments_35673784-7-1e9db3.json => repos_kohsuke_sandbox-ant_comments_35673784-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4-d1822d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5-62d11e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1-a9b48b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2-a4924f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/{repos_github-api-test-org_github-api-test-2d35cecf-0212-47d5-8dd3-15b4838d56c6.json => repos_github-api-test-org_github-api-test-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/{repos_github-api-test-org_github-api-test_issues-4c0eec6b-2118-4a14-8a95-3e55fd260384.json => repos_github-api-test-org_github-api-test_issues-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/{repos_github-api-test-org_github-api-test_issues_1-b2b352de-1dfc-4bbf-8b29-6699c09adcba.json => repos_github-api-test-org_github-api-test_issues_1-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/{repos_github-api-test-org_github-api-test_milestones-9f6e9872-cdec-405b-a820-838d4a40ab00.json => repos_github-api-test-org_github-api-test_milestones-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/{repos_github-api-test-org_github-api-test_milestones-c528f3b4-7651-4943-8247-fc4eb960f7c7.json => repos_github-api-test-org_github-api-test_milestones-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/{user-8104cc51-7147-4bc3-9004-2cec25e972f8.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2-2d35ce.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/{repos_github-api-test-org_github-api-test_hooks-4-0765fd.json => repos_github-api-test-org_github-api-test_hooks-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/{repos_github-api-test-org_github-api-test_hooks-5-9f3310.json => repos_github-api-test-org_github-api-test_hooks-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/{repos_github-api-test-org_github-api-test_hooks-7-3dddac.json => repos_github-api-test-org_github-api-test_hooks-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/{repos_github-api-test-org_github-api-test_hooks-8-8cfab8.json => repos_github-api-test-org_github-api-test_hooks-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10-4c0eec.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11-b2b352.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12-9f6e98.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/{repos_github-api-test-org_github-api-test_milestones-3-7cb4f1.json => repos_github-api-test-org_github-api-test_milestones-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/{repos_github-api-test-org_github-api-test_milestones-6-9a91aa.json => repos_github-api-test-org_github-api-test_milestones-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9-c528f3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1-8104cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/__files/{user-eba96b24-3354-4d21-bd2a-388a13ba9832.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1-eba96b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-3894ddd2-ac57-4592-bc01-9e5d7f93ef6e.json => events-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d.json => events-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-d66da82e-6a4f-496f-824c-53e4db13d18a.json => events-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-79407878-4e6c-4d87-a3b7-f2d003b89d91.json => events-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-d3ce344a-2eeb-443b-9929-612fb9cbde1f.json => events-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-5d107ab6-f41e-41dd-b699-ed83c6edbceb.json => events-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-6f4a1d77-46f9-4f38-a260-953487c97b4f.json => events-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-6354ffb5-fa83-474c-94ea-f91ca33f5a71.json => events-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-3719d162-a479-4a4c-803c-6747e224509c.json => events-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{events-98288433-46b1-4ad0-9857-c44ae6ac3182.json => events-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/{user-01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10-3894dd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11-1f4bc3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2-d66da8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3-d3ce34.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4-794078.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5-5d107a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6-6f4a1d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7-6354ff.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8-3719d1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9-982884.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1-01c5f6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{orgs_github-api-baecb5db-6e9c-441b-8414-c8070d9bc0c2.json => orgs_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repos_github-api_github-api-891820f6-7cd7-437a-8ec1-16c3e76c53ec.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repos_github-api_github-api_issues-a70d05ac-5820-4749-8318-e422f0f6eaf5.json => repos_github-api_github-api_issues-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-5a770b70-ca92-478e-8bb5-c713553ddefb.json => repositories_617210_issues-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-e04b8865-9ace-405a-b8d9-f8bcacb9bfa8.json => repositories_617210_issues-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-fe625e7c-4b31-4b30-bc77-a763a3774fdc.json => repositories_617210_issues-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-ab269330-3eb7-4ec1-9211-ecc8d0d70701.json => repositories_617210_issues-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-9486f660-2139-4f84-ae0f-898d0369d061.json => repositories_617210_issues-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-c9e769fc-6556-4374-b397-244843a75000.json => repositories_617210_issues-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-46f0ca81-080b-419a-b494-df00573bd9aa.json => repositories_617210_issues-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea.json => repositories_617210_issues-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-7d74dc71-0c93-4a0a-8f8e-c6a71027b219.json => repositories_617210_issues-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-e22232e4-eb5c-4657-b485-171936f6174e.json => repositories_617210_issues-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-d2dadb59-c855-4c32-8a98-5ed6992cf3ff.json => repositories_617210_issues-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-63d2db0d-08ce-498b-8c8d-903da44e2e94.json => repositories_617210_issues-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-e084b859-6ef7-4657-ad19-0c0b1a5f9e4d.json => repositories_617210_issues-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-c66e220e-9138-4ead-92fb-7e882c71b9bf.json => repositories_617210_issues-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{repositories_617210_issues-ddbca5ee-6c30-447d-8667-8c29c151e6d5.json => repositories_617210_issues-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/{user-7741e4f6-c93e-4760-bb92-070e61f5a475.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2-baecb5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3-891820.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4-a70d05.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10-5a770b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11-e04b88.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12-fe625e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13-ab2693.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14-9486f6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15-c9e769.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16-46f0ca.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17-b2fa4e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18-7d74dc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19-e22232.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5-d2dadb.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6-63d2db.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7-e084b8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8-c66e22.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9-ddbca5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1-7741e4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/{user-f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/{user_repos-5f89ddd0-72f0-4e2a-9185-0828197b9350.json => user_repos-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/{users_bitwiseman-f759e6af-2c5c-46f3-be75-4f3ee733b018.json => users_bitwiseman-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1-f80e1f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3-5f89dd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2-f759e6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/{orgs_github-api-test-org-e1b27b93-da09-4f0e-a103-effeb87370a6.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/{repos_github-api-test-org_testgetteamsforrepo-cf3c4969-2d22-4218-8665-164a9097d3c6.json => repos_github-api-test-org_testgetteamsforrepo-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/{repos_github-api-test-org_testgetteamsforrepo_teams-1dd41f2e-d246-428c-8f65-045e5b885e86.json => repos_github-api-test-org_testgetteamsforrepo_teams-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/{user-692ed5ba-d82c-446b-9cf6-8820491e366b.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2-e1b27b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3-cf3c49.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4-1dd41f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1-692ed5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_buildhive_buildhive_issues_26_comments-7cd8798a-89d6-4f01-a203-0eb3c111d160.json => repos_buildhive_buildhive_issues_26_comments-54.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_cdfoundation_foundation_issues_13_comments-5dd3d867-5116-4abc-86ff-038fd86772bb.json => repos_cdfoundation_foundation_issues_13_comments-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_cdfoundation_foundation_issues_18_comments-ab6d7164-36f9-4042-b3ea-120157a49ce2.json => repos_cdfoundation_foundation_issues_18_comments-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_cloudbees_jep-internal-staging_issues_4_comments-70b2060c-1621-4059-92d6-57b43d5cf3d3.json => repos_cloudbees_jep-internal-staging_issues_4_comments-32.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_cloudbees_support-analytics_issues_40_comments-392bf11b-01ff-4b4b-be18-d56a295cd56d.json => repos_cloudbees_support-analytics_issues_40_comments-25.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_datadog_puppet-datadog-agent_issues_81_comments-2bcf1141-9dc6-4a96-bab5-70bfb95e1c09.json => repos_datadog_puppet-datadog-agent_issues_81_comments-38.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_eclipse-ee4j_jaxb-ri_issues_103_comments-279abefb-47c5-47f3-8515-1ee89869be16.json => repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_github-api_github-api_issues_178_comments-f84aa364-b44f-4171-8b0b-73202b03f6bd.json => repos_github-api_github-api_issues_178_comments-39.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_github-api_github-api_issues_416_comments-5957b82d-97dd-4209-b1dc-858199372769.json => repos_github-api_github-api_issues_416_comments-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_github-api_github-api_issues_445_comments-4a0ccab2-b9b2-4d46-9339-004e5a5d7d01.json => repos_github-api_github-api_issues_445_comments-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_javaee_jaxb-v2_issues_103_comments-7499861c-3874-4dd8-af28-b86a1a248260.json => repos_javaee_jaxb-v2_issues_103_comments-28.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-0dd1dc99-189c-456a-9532-e8d8c8beb565.json => repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_cobertura-plugin_issues_26_comments-9937db1e-b8e2-459a-99bb-63d076a58576.json => repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_junit-plugin_issues_108_comments-8b073dc0-4dd7-4428-b0fd-017e34981000.json => repos_jenkinsci_junit-plugin_issues_108_comments-27.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_matrix-project-plugin_issues_11_comments-bc1b7539-f071-4d34-8803-ea56ee4ccf52.json => repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_maven-plugin_issues_86_comments-8df64f6b-d2d7-4389-a0c8-166f410896c2.json => repos_jenkinsci_maven-plugin_issues_86_comments-46.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_packaging_issues_57_comments-77b9e551-89d2-48ff-9755-8c476e7e3859.json => repos_jenkinsci_packaging_issues_57_comments-41.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_port-allocator-plugin_issues_6_comments-d346fa8f-6520-4845-b2dd-a8bacd11df33.json => repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-b19ff40f-0a88-4bc0-84ec-19604c3e1d86.json => repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_subversion-plugin_issues_229_comments-bdd8d87e-acc3-41ff-9fb3-f003176cd32c.json => repos_jenkinsci_subversion-plugin_issues_229_comments-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-5d72e1b0-acc2-4cb4-9407-485bf0edbb4a.json => repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-64c20aaf-a552-45f2-b762-13c8332e2e75.json => repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_access-modifier_issues_18_comments-537dcc25-9bda-405e-8b61-996723dfe239.json => repos_kohsuke_access-modifier_issues_18_comments-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_akuma_issues_12_comments-ff723ca0-048e-4130-88c0-b41efb22f9b5.json => repos_kohsuke_akuma_issues_12_comments-45.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_args4j_issues_138_comments-5875b84c-e475-46be-a356-e6a6384d16fc.json => repos_kohsuke_args4j_issues_138_comments-36.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_args4j_issues_151_comments-e2c50d75-bd6b-4352-95b7-c6a16edac6cf.json => repos_kohsuke_args4j_issues_151_comments-37.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_args4j_issues_170_comments-7037b3d3-30bb-473d-a3b7-287381648ac1.json => repos_kohsuke_args4j_issues_170_comments-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_com4j_issues_58_comments-a8438cec-832d-4a65-8972-42add8eed66b.json => repos_kohsuke_com4j_issues_58_comments-43.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-05248ca7-2309-4eb3-934c-74d670a3a6eb.json => repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_file-leak-detector_issues_48_comments-8e7dee31-69ea-4ac3-9894-b2df06f9967f.json => repos_kohsuke_file-leak-detector_issues_48_comments-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_j-interop_issues_3_comments-6785e2b0-ef61-4233-9fac-998b581bf5a4.json => repos_kohsuke_j-interop_issues_3_comments-48.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_libpam4j_issues_12_comments-902180ec-5fe6-44fc-95e6-bc1c994a895c.json => repos_kohsuke_libpam4j_issues_12_comments-30.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_localizer_issues_7_comments-4d459f11-3522-44d2-b3df-68833ac7d17f.json => repos_kohsuke_localizer_issues_7_comments-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_mimepull_issues_2_comments-a09ab691-cab7-4a08-9d01-9e83aaa1e8d7.json => repos_kohsuke_mimepull_issues_2_comments-40.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_winp_issues_64_comments-ce501b97-f7fc-48e2-92f2-39d37ad03b0c.json => repos_kohsuke_winp_issues_64_comments-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_winsw_issues_199_comments-e75ddcfb-3e74-4d2a-9372-3bf43f0acea0.json => repos_kohsuke_winsw_issues_199_comments-35.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_winsw_issues_288_comments-6372463b-b035-44ab-aa19-f95c2dda08e9.json => repos_kohsuke_winsw_issues_288_comments-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_winsw_issues_348_comments-92f2c6c5-159c-4d8d-8c1b-a685e1a346a3.json => repos_kohsuke_winsw_issues_348_comments-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_kohsuke_winsw_issues_401_comments-592b0cc1-594f-4d29-9f48-154c9dbbccea.json => repos_kohsuke_winsw_issues_401_comments-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_mojohaus_animal-sniffer_issues_9_comments-f2e8ce53-9c07-4118-be54-55ea43212f64.json => repos_mojohaus_animal-sniffer_issues_9_comments-50.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_oracle_opengrok_issues_966_comments-5980616e-a5c0-4060-9d8c-7272da82fb74.json => repos_oracle_opengrok_issues_966_comments-44.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_salesforcelabs_forcepad_issues_25_comments-aa901e2c-ed25-4848-b60a-d8b6be3ed996.json => repos_salesforcelabs_forcepad_issues_25_comments-53.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{repos_voxpupuli_puppet-jenkins_issues_110_comments-d9b77135-2860-4595-ac00-01203f426501.json => repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{search_issues-a3ad6065-e8f9-4470-91cc-ee3982bfb8df.json => search_issues-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{search_issues-e1b5c11f-4469-4044-9cfc-0529b04bb1c3.json => search_issues-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{search_issues-7e3768e1-e5c1-457a-9354-f5d9ef504fc2.json => search_issues-34.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/{user-b01b8228-347d-439f-a3f7-db38f3d15881.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54-7cd879.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16-5dd3d8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17-ab6d71.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32-70b206.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25-392bf1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38-2bcf11.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12-279abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39-f84aa3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11-5957b8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9-4a0cca.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28-749986.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29-0dd1dc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_jenkinsci_aws-credentials-plugin_issues_38_comments-33-cb19fd.json => repos_jenkinsci_aws-credentials-plugin_issues_38_comments-33.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21-9937db.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27-8b073d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51-bc1b75.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46-8df64f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41-77b9e5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49-d346fa.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31-b19ff4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10-bdd8d8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24-5d72e1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7-64c20a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_jenkinsci_workflow-cps-global-lib-plugin_issues_76_comments-19-d17aa2.json => repos_jenkinsci_workflow-cps-global-lib-plugin_issues_76_comments-19.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4-537dcc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45-ff723c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36-5875b8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37-e2c50d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_kohsuke_args4j_issues_163_comments-26-e856f0.json => repos_kohsuke_args4j_issues_163_comments-26.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13-7037b3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43-a8438c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47-05248c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14-8e7dee.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48-6785e2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30-902180.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_kohsuke_libpam4j_issues_23_comments-20-1736fb.json => repos_kohsuke_libpam4j_issues_23_comments-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_kohsuke_libpam4j_issues_24_comments-18-ca102d.json => repos_kohsuke_libpam4j_issues_24_comments-18.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15-4d459f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40-a09ab6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_kohsuke_winp_issues_40_comments-42-2b6799.json => repos_kohsuke_winp_issues_40_comments-42.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23-ce501b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35-e75ddc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22-637246.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8-92f2c6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5-592b0c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/{repos_kohsuke_winsw_issues_79_comments-6-0db23c.json => repos_kohsuke_winsw_issues_79_comments-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50-f2e8ce.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44-598061.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53-aa901e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52-d9b771.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2-a3ad60.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3-e1b5c1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34-7e3768.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1-b01b82.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/{repos_kohsuke_test-5e93357f-40cc-49ad-90ca-355a4703de1e.json => repos_kohsuke_test-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/{repos_kohsuke_test_issues_3-805b83e0-61e7-4dc4-844e-a834681cd311.json => repos_kohsuke_test_issues_3-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/{repos_kohsuke_test_issues_3_comments-83d2db1f-2c02-4f03-9bb0-668774dd4f8d.json => repos_kohsuke_test_issues_3_comments-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/{repos_kohsuke_test_issues_4-d90a1a3e-5992-44bd-bb74-2122878d2da5.json => repos_kohsuke_test_issues_4-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/{user-0d50edb7-4ca2-4877-83d1-1617ed206128.json => user-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1-5e9335.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4-805b83.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5-83d2db.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2-d90a1a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/{repos_kohsuke_test_issues_4_comments-3-648b70.json => repos_kohsuke_test_issues_4_comments-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6-0d50ed.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/{repos_kohsuke_empty-commit-486d8363-a1b1-4e0c-8039-7c760428cddd.json => repos_kohsuke_empty-commit-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/{repos_kohsuke_empty-commit_commits-82c5e19d-5418-414e-a21e-0325daf45e7b.json => repos_kohsuke_empty-commit_commits-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/{user-3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/{users_kohsuke-8e500715-ba22-4a3d-823c-3be6c7ceb8ec.json => users_kohsuke-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3-486d83.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4-82c5e1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1-3c7e63.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2-8e5007.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{orgs_github-api-ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff.json => orgs_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repos_github-api_github-api-fcfac221-9668-484b-a722-26d83e00a13a.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repos_github-api_github-api_issues-b87318fd-8120-4fad-8c4d-553dafde3319.json => repos_github-api_github-api_issues-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-b4031b7a-b4c2-4f84-be55-86edaf61cc80.json => repositories_617210_issues-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-f8361bc0-abb8-4880-9da5-e539f0e4b8c8.json => repositories_617210_issues-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-6217b760-4265-471f-bbcd-20e198106320.json => repositories_617210_issues-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-4cb18e29-c548-413e-9c74-2c23f77e97a3.json => repositories_617210_issues-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-45f995e6-9f51-4281-8c85-b482a52cffb8.json => repositories_617210_issues-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-e299e545-1101-4f9e-851b-a43c6983bd86.json => repositories_617210_issues-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-499826cb-a83b-4bb5-84d9-4d3662c96917.json => repositories_617210_issues-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-da0634f9-41a1-4bc9-aa50-956fc854efd8.json => repositories_617210_issues-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98.json => repositories_617210_issues-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-fa3775ff-7638-4bf5-b845-5aa41ec8ede9.json => repositories_617210_issues-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-22bd53a0-14f4-4ae6-b67d-8bd2a16c354e.json => repositories_617210_issues-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-e0b920f3-d7a0-489e-8da9-9cbf269654b1.json => repositories_617210_issues-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-58ea2313-3d64-4f4f-9692-d9bfb5f39038.json => repositories_617210_issues-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-90d12de0-8d80-40f1-a54d-646353fb2385.json => repositories_617210_issues-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-ccbca45e-e252-4d08-a9e0-fe30fb7ebe38.json => repositories_617210_issues-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-f5091cf8-c8b5-4550-833d-2143f23b6a47.json => repositories_617210_issues-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-1b4ed16e-84bf-498f-975f-7d945e134452.json => repositories_617210_issues-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-1672447e-5f44-4d04-a88e-e8238b5c6a88.json => repositories_617210_issues-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-e381272e-96f7-416e-bb78-b4ad52ab4af4.json => repositories_617210_issues-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{repositories_617210_issues-c62bb8d2-e4f6-40e5-9a92-06f6cff0f457.json => repositories_617210_issues-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/{user-95af3fa7-b1d9-4149-b69c-f69983ac4a7f.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2-ed7291.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3-fcfac2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4-b87318.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10-b4031b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11-f8361b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12-6217b7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13-4cb18e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14-45f995.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15-e299e5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16-499826.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17-da0634.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18-f4a18f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19-fa3775.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20-22bd53.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21-e0b920.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22-58ea23.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23-90d12d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24-ccbca4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5-f5091c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6-1b4ed1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7-167244.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8-e38127.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9-c62bb8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1-95af3f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_cloudbeers-4936bdf6-0a61-48e7-a883-8da9517a5c45.json => orgs_cloudbeers-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_cloudbees-769fb685-65e4-479b-9708-73495d1c9493.json => orgs_cloudbees-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_cloudbees-community-cce9ba85-74cd-435a-82aa-0bd7d00c604e.json => orgs_cloudbees-community-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_infradna-af7edd31-d299-40d9-ae36-c8560bd60268.json => orgs_infradna-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_java-schema-utilities-89ed2c06-4671-48e6-bb63-79188b413e58.json => orgs_java-schema-utilities-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_jenkins-infra-30e7c1b4-bf52-4737-8229-71038769bfae.json => orgs_jenkins-infra-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_jenkinsci-100ade7d-2083-4ff9-8b1b-2d8648c60b65.json => orgs_jenkinsci-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_jenkinsci-cert-0a4422be-27ec-4110-9599-166bc51809f2.json => orgs_jenkinsci-cert-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_legomatterhorn-26ad87d6-e506-4c98-8890-c81a9551aebf.json => orgs_legomatterhorn-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{orgs_stapler-e0ce2766-9611-4f1a-91fe-8f53a32132ae.json => orgs_stapler-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{user-f4bfaca9-99e6-47db-9d5c-00a803146d56.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{users_kohsuke-0e40390e-60c3-4161-864a-2587a9b75e8e.json => users_kohsuke-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/{users_kohsuke_orgs-e6c67f05-5a96-4afb-8e7a-030b55572966.json => users_kohsuke_orgs-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10-4936bd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5-769fb6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9-cce9ba.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6-af7edd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8-89ed2c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11-30e7c1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4-100ade.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13-0a4422.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12-26ad87.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7-e0ce27.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1-f4bfac.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2-0e4039.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3-e6c67f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/{orgs_github-api-test-org-f298a1b9-4064-46ad-928a-10ea257461d9.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/{repos_github-api-test-org_jenkins-e9db4f2d-55a2-498e-b3eb-d66b87b7b86b.json => repos_github-api-test-org_jenkins-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/{repos_github-api-test-org_jenkins_collaborators-bce97482-6a11-44e5-a112-29230b142636.json => repos_github-api-test-org_jenkins_collaborators-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/{user-4457eef8-0cad-4b2e-9639-85d62c8c474a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2-f298a1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3-e9db4f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4-bce974.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1-4457ee.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/{user-a4cacc2c-726b-499a-bfdc-302f729fe6c2.json => user-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/{user_orgs-2985ea8b-b43b-45ab-b2ce-162ca7bdb55f.json => user_orgs-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2-a4cacc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1-2985ea.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/{user-fd1c2585-40a5-4ae9-85b5-5ab28ed9379e.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/{user_orgs-f3813253-5f7d-47c0-91e0-35803e96fe36.json => user_orgs-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/{user_teams-49ff8dab-d286-4880-8c78-367cb7c360a2.json => user_teams-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1-fd1c25.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3-f38132.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2-49ff8d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_107424_teams-2fdc0562-25ee-4ff7-8207-444ebbc94abd.json => organizations_107424_teams-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_107424_teams-864a80f6-b8f4-4a01-bf1b-06d0977753da.json => organizations_107424_teams-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_107424_teams-881e0897-44cd-42c4-88c4-50046ee19a18.json => organizations_107424_teams-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_107424_teams-bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74.json => organizations_107424_teams-26.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_235526_teams-3945b427-290f-4fa2-a720-79cb00ba290e.json => organizations_235526_teams-35.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_235526_teams-8591cc9c-9c1f-46ab-980f-784ed7ad2b54.json => organizations_235526_teams-44.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{organizations_235526_teams-bed3177f-0cd7-4ebb-acff-67cc43fd2504.json => organizations_235526_teams-47.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_beautify-web-62298d74-fe3c-459d-9f70-450e80247969.json => orgs_beautify-web-67.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_beautify-web_teams-58684478-ae6b-43c2-b30c-af37aeb81621.json => orgs_beautify-web_teams-68.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees-ce8716a4-ec25-4626-9a3a-205e5558bd39.json => orgs_cloudbees-33.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-1d3fc4da-c320-4621-bf6c-4fa95aeb487e.json => orgs_cloudbees_teams-34.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-35c47636-9b2c-4e43-866a-62d34ddf04fb.json => orgs_cloudbees_teams-37.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-4d6d15f8-8345-4ce7-af12-dcd50335d2c0.json => orgs_cloudbees_teams-39.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-57f5eb24-dd30-4d2c-9e6a-90dcd973e21f.json => orgs_cloudbees_teams-41.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-632605dd-2411-4c5d-8fd0-7d57f23cb0a5.json => orgs_cloudbees_teams-43.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-c3bba3a6-1c09-4663-bbd5-61f4184faffa.json => orgs_cloudbees_teams-46.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_cloudbees_teams-fbf640ca-c41a-4e82-9c5a-75ba2175bc0c.json => orgs_cloudbees_teams-49.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_github-api-test-org-a529986c-70bb-4329-9816-ec1f75673e9c.json => orgs_github-api-test-org-51.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_github-api-test-org_teams-4eeff351-c1bd-449c-bf07-0cd3d013dc9b.json => orgs_github-api-test-org_teams-52.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_github-api-test-org_teams-c4dada63-33ed-4ac0-856c-e35d466ac7f8.json => orgs_github-api-test-org_teams-54.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-inc-e0b11bd2-736d-44c8-aa64-f5848d4691f6.json => orgs_jenkins-inc-30.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-inc_teams-383d61fc-1c69-4ae1-919a-b98b678b47cd.json => orgs_jenkins-inc_teams-31.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-infra-b7c4f477-4e3a-4505-874e-dd816080c7f4.json => orgs_jenkins-infra-56.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-infra_teams-196db464-b833-490c-97e4-79f79fe29f07.json => orgs_jenkins-infra_teams-57.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-infra_teams-a7f22b01-940f-40f5-9496-f3e0bd87dbf8.json => orgs_jenkins-infra_teams-59.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-infra_teams-b5053ddf-d2f8-4ea4-a246-1118f02f3ac7.json => orgs_jenkins-infra_teams-61.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-infra_teams-b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74.json => orgs_jenkins-infra_teams-63.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkins-infra_teams-f8bd811b-e074-4e0a-b2f3-dc3f749b5c07.json => orgs_jenkins-infra_teams-65.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci-eac3f0df-0404-4c43-9864-bf3d6f249294.json => orgs_jenkinsci-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-0aaf0590-1a5b-4323-8dbc-8fc63b3c5775.json => orgs_jenkinsci_teams-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-2832b4d6-9274-4137-9421-4855660803ec.json => orgs_jenkinsci_teams-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-421fa98d-71d5-4c1c-a6cb-4f7f301668c7.json => orgs_jenkinsci_teams-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-4922cdbe-d115-4bb4-94be-4f75c07fc45d.json => orgs_jenkinsci_teams-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-4b9e6062-54b4-41b5-ba0d-9c891b471122.json => orgs_jenkinsci_teams-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-51a481cc-1f18-4eae-a2c7-3835859468b4.json => orgs_jenkinsci_teams-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-7e7d35f3-0e07-4cbb-a814-e363eca72d3d.json => orgs_jenkinsci_teams-25.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4.json => orgs_jenkinsci_teams-28.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08.json => orgs_jenkinsci_teams-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-acf98bee-b6c1-4f33-b62e-f86b8d5445fe.json => orgs_jenkinsci_teams-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{orgs_jenkinsci_teams-bedcaedb-24fc-4a6e-a099-b64fd26d4e97.json => orgs_jenkinsci_teams-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{user-9a793342-57f8-4135-bd51-f0f96e57d45b.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/{user_teams-d60dafe1-79c4-4212-9544-739b7ee976b9.json => user_teams-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11-bed0fc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20-2fdc05.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23-864a80.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26-881e08.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35-8591cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44-3945b4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47-bed317.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67-62298d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68-586844.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33-ce8716.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34-57f5eb.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37-632605.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39-fbf640.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41-c3bba3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43-1d3fc4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46-4d6d15.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49-35c476.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51-a52998.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52-c4dada.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54-4eeff3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30-e0b11b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31-383d61.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56-b7c4f4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57-196db4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59-b6bb78.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61-a7f22b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63-b5053d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65-f8bd81.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3-eac3f0.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10-bedcae.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13-acf98b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15-0aaf05.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17-90bfe4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19-4922cd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22-4b9e60.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25-51a481.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28-a9e651.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4-421fa9.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6-7e7d35.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8-2832b4.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_1450069_members_bitwiseman-50-4957ae.json => teams_1450069_members_bitwiseman-50.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_1809126_members_bitwiseman-18-242ec4.json => teams_1809126_members_bitwiseman-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_1882929_members_bitwiseman-66-285fc3.json => teams_1882929_members_bitwiseman-66.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_1941826_members_bitwiseman-32-094e4d.json => teams_1941826_members_bitwiseman-32.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_1986920_members_bitwiseman-29-0dd3d9.json => teams_1986920_members_bitwiseman-29.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2070581_members_bitwiseman-42-e22d18.json => teams_2070581_members_bitwiseman-42.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2185547_members_bitwiseman-14-301ee9.json => teams_2185547_members_bitwiseman-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2188150_members_bitwiseman-58-1a21b5.json => teams_2188150_members_bitwiseman-58.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2278154_members_bitwiseman-60-2a2981.json => teams_2278154_members_bitwiseman-60.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2300722_members_bitwiseman-7-9bec56.json => teams_2300722_members_bitwiseman-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2384898_members_bitwiseman-40-95da17.json => teams_2384898_members_bitwiseman-40.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2384906_members_bitwiseman-36-f56cc4.json => teams_2384906_members_bitwiseman-36.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2478842_members_bitwiseman-16-89727f.json => teams_2478842_members_bitwiseman-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2510135_members_bitwiseman-62-0a3910.json => teams_2510135_members_bitwiseman-62.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2658933_members_bitwiseman-64-23b3d8.json => teams_2658933_members_bitwiseman-64.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2832516_members_bitwiseman-27-01adc0.json => teams_2832516_members_bitwiseman-27.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2832517_members_bitwiseman-21-bd3f96.json => teams_2832517_members_bitwiseman-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2915408_members_bitwiseman-45-b4fb18.json => teams_2915408_members_bitwiseman-45.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_2934265_members_bitwiseman-24-f07c2b.json => teams_2934265_members_bitwiseman-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_3023453_members_bitwiseman-12-2724fa.json => teams_3023453_members_bitwiseman-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_3136781_members_bitwiseman-48-ea7a1b.json => teams_3136781_members_bitwiseman-48.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_3451996_members_bitwiseman-55-0e9309.json => teams_3451996_members_bitwiseman-55.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_496711_members_bitwiseman-9-9e90f9.json => teams_496711_members_bitwiseman-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_663296_members_bitwiseman-69-a75539.json => teams_663296_members_bitwiseman-69.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_711073_members_bitwiseman-5-9723ac.json => teams_711073_members_bitwiseman-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_820404_members_bitwiseman-53-be6df5.json => teams_820404_members_bitwiseman-53.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/{teams_879403_members_bitwiseman-38-189224.json => teams_879403_members_bitwiseman-38.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1-9a7933.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2-d60daf.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/{orgs_github-api-test-org-1839874d-c184-4f20-942f-cc6d36806868.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/{repos_github-api-test-org_rubywm-5b2f012d-aa23-4e59-849c-22b53a469c95.json => repos_github-api-test-org_rubywm-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/{repos_kohsuke_rubywm-7f6b9ed5-222f-4c89-95a7-e45ef24d78a7.json => repos_kohsuke_rubywm-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/{repos_kohsuke_rubywm_forks-044af303-143e-4469-be96-0a6e72032e5c.json => repos_kohsuke_rubywm_forks-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/{user-07a0042d-8162-4e85-9ed4-0ed31ebc9d63.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3-183987.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5-5b2f01.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2-7f6b9e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4-044af3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1-07a004.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-13ae5b85-5c4d-409b-94b4-f1d995106d24.json => organizations_107424_repos-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-f533dd05-f467-4045-85f2-de7ef31e3c43.json => organizations_107424_repos-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-df03bd6c-ec4b-4911-8d43-58d2e2498eeb.json => organizations_107424_repos-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-26bad52b-c62b-469b-885f-453d7b164aca.json => organizations_107424_repos-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-8315bb73-ac7c-4890-83ee-8802c5eb57a6.json => organizations_107424_repos-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-ecf517ff-a34e-4190-9e4a-7ce48bccffae.json => organizations_107424_repos-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-45dd04d4-645f-47f2-8412-52e08b3c2e50.json => organizations_107424_repos-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-a73c5a75-e101-4321-aea4-c633929320e8.json => organizations_107424_repos-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-e66682bb-4a55-4cf9-9092-9c3aaf6dc915.json => organizations_107424_repos-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-0e04a7f4-8a85-40ec-b90d-faf2822b648f.json => organizations_107424_repos-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-5cb3f8b7-17fc-4a5b-a8b3-99c07a604469.json => organizations_107424_repos-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-626ca8b6-883d-405d-a271-84b38deb0567.json => organizations_107424_repos-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-e0e43c36-cd33-4f86-b35d-165f964bf15e.json => organizations_107424_repos-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-6f8a70ef-2168-4fad-8f28-d1ad0584525d.json => organizations_107424_repos-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-aec88ab4-fa24-43a9-93c9-82026978b8a7.json => organizations_107424_repos-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-d95d3c51-42d4-4138-86ba-95b07d066993.json => organizations_107424_repos-25.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-471f9be3-9f94-4788-bd01-316c9e5d03a4.json => organizations_107424_repos-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-d68a564a-7eca-47ca-af21-1bb492309cfc.json => organizations_107424_repos-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-d4de5f04-8979-4506-b24d-f4e2ca3af58a.json => organizations_107424_repos-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-db791f4d-4464-4055-80ae-83d017b7596d.json => organizations_107424_repos-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-49da2fa3-254f-41d7-8a0f-1ba36c19eae4.json => organizations_107424_repos-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{organizations_107424_repos-d4d7b222-62d1-4d88-bab9-ccf707f314e4.json => organizations_107424_repos-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{orgs_jenkinsci-72681a2c-9db9-44b8-a9cf-4084568695a0.json => orgs_jenkinsci-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{orgs_jenkinsci_repos-75d09b41-374d-4c15-b8fd-06b9e1e8402c.json => orgs_jenkinsci_repos-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/{user-50e8f530-8812-4f8d-afb0-8c5fc9294507.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10-13ae5b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11-f533dd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12-df03bd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13-26bad5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14-8315bb.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15-ecf517.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16-45dd04.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17-a73c5a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18-e66682.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19-0e04a7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20-5cb3f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21-626ca8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22-e0e43c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23-6f8a70.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24-aec88a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25-d95d3c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4-471f9b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5-d68a56.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6-d4de5f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7-db791f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8-49da2f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9-d4d7b2.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2-72681a.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3-75d09b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1-50e8f5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/{orgs_github-api-test-org-4f288ca6-2584-436c-9700-fa1e99e18587.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/{orgs_github-api-test-org_teams-b980fc5b-1824-4692-b40e-3d54a610c539.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/{user-d4155364-c1f5-4f54-bd13-38ab188af938.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2-4f288c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3-b980fc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1-d41553.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/{orgs_github-api-test-org-805bfcf6-6b2a-4489-91d9-03c37286dfd5.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/{orgs_github-api-test-org_teams-44dbf3a1-23da-4193-a945-efe1f7977871.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/{orgs_github-api-test-org_teams_core-developers-b7236bc9-4447-4721-acdb-7598066525d6.json => orgs_github-api-test-org_teams_core-developers-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/{user-04565ff3-3827-4bce-b8bc-69aa2b88374b.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2-805bfc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3-44dbf3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4-b7236b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1-04565f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/{orgs_github-api-test-org-4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/{orgs_github-api-test-org_teams-625f653e-9301-47ba-9bc5-2e25be8ba17e.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/{user-fc66c1e3-e6a4-4802-a5e2-8b948612ec57.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2-4a4f8e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3-625f65.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1-fc66c1.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/{orgs_github-api-test-org-bbf24d32-ddda-44fe-acc3-003e9f629f32.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/{orgs_github-api-test-org_teams-7e66f997-9af6-4cab-826b-807692be0274.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/{repos_github-api-test-org_jenkins-1d18fc38-3b70-493e-81d7-3061d559a046.json => repos_github-api-test-org_jenkins-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/{user-0a855cde-5f76-4227-889d-462ad0dbd34b.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2-bbf24d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3-7e66f9.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4-1d18fc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1-0a855c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/{rate_limit-195911b7-d3b7-4eb4-9d1e-f39465b89bb8.json => rate_limit-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/{user-50a73d49-27a4-470e-bd8d-0665521673e3.json => user-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1-195911.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2-50a73d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/{repos_github-api-test-org_test-readme-bb7dedcd-c56b-455f-b7b3-3ff0d715b07e.json => repos_github-api-test-org_test-readme-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/{repos_github-api-test-org_test-readme_readme-7d02eec3-3ed8-490a-a064-d4b60ce8b6ce.json => repos_github-api-test-org_test-readme_readme-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/{user-6da871aa-818a-4d9c-a356-cb1cba2237ac.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2-bb7ded.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3-7d02ee.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1-6da871.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/{repos_jenkinsci_jenkins-28457939-0c67-4c58-8f8e-8d44384f4506.json => repos_jenkinsci_jenkins-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/{repos_jenkinsci_jenkins_git_refs_heads_master-257aa346-b2fa-4808-a587-ce26a6859bf7.json => repos_jenkinsci_jenkins_git_refs_heads_master-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/{user-045baee3-176e-43e0-ab38-bdf00d276fe0.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2-284579.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3-257aa3.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1-045bae.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/{user-3068cd06-63e4-4658-a037-d113f99314af.json => user-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/{user_repos-ead41396-5e65-4478-8e81-03bb7cd5d2d1.json => user_repos-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/{repos_bitwiseman_github-api-test-rename-2-b1b919.json => repos_bitwiseman_github-api-test-rename-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/{repos_bitwiseman_github-api-test-rename-3-397146.json => repos_bitwiseman_github-api-test-rename-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/{repos_bitwiseman_github-api-test-rename-4-b0c111.json => repos_bitwiseman_github-api-test-rename-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/{repos_bitwiseman_github-api-test-rename-5-6cc04a.json => repos_bitwiseman_github-api-test-rename-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/{repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json => repos_bitwiseman_github-api-test-rename2-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/{repos_bitwiseman_github-api-test-rename2-8-17b2c9.json => repos_bitwiseman_github-api-test-rename2-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6-3068cd.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1-ead413.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/{repos_github-api-test-org_test-labels-47685ef9-9d9a-4e96-945b-b58a75e9807f.json => repos_github-api-test-org_test-labels-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/{repos_github-api-test-org_test-labels_labels-28c58b29-a050-4a83-b08e-bf202cff89a9.json => repos_github-api-test-org_test-labels_labels-3.json} (100%)
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-a78a0f34-4527-48ba-88f8-16c319430bc6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2-47685e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15-6c2ac6.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18-b1cf4b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3-28c58b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5-154147.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4-e1469d.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10-cace49.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11-e4b594.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12-0dad57.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13-09f51c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14-331784.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6-bee660.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7-528317.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8-c772a0.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9-6aef5e.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16-6ad140.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17-7c5913.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1-a78a0f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{repos_bitwiseman_github-api-test-autoinit-64af61d8-56b5-4b55-ad9f-ca9d6597e07a.json => repos_bitwiseman_github-api-test-autoinit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{repos_bitwiseman_github-api-test-autoinit-a1a05f8b-7bd8-4200-a587-fd99f720508b.json => repos_bitwiseman_github-api-test-autoinit-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{repos_bitwiseman_github-api-test-autoinit-51dabcc5-7825-4251-b560-8927ffa265b5.json => repos_bitwiseman_github-api-test-autoinit-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{repos_bitwiseman_github-api-test-autoinit-c71176ad-bfc9-4e39-aed8-6c4abd1c5979.json => repos_bitwiseman_github-api-test-autoinit-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{repos_bitwiseman_github-api-test-autoinit_readme-459f3734-bfaa-4f29-97fd-69574b66d965.json => repos_bitwiseman_github-api-test-autoinit_readme-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{user-b16c3b01-8cf2-4f90-a77a-f6ff9e371db0.json => user-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/{user_repos-7be48128-4960-4274-8681-118897a274af.json => user_repos-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2-64af61.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3-a1a05f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4-c71176.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7-51dabc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/{repos_bitwiseman_github-api-test-autoinit-8-42bbd1.json => repos_bitwiseman_github-api-test-autoinit-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5-459f37.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6-b16c3b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1-7be481.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/{organizations_7544739_team_820406-8b1ba756-0fb7-49bf-8cd8-0febdccefd7e.json => organizations_7544739_team_820406-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/{orgs_github-api-test-org-84aa5465-24ab-43e3-9655-e835c39bfa65.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/{orgs_github-api-test-org_teams-d833590f-9896-462c-846b-712b50377536.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/{teams_820406-9302cc40-d07a-4ad2-b958-f035a849e3fb.json => teams_820406-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/{user-59e094cf-1ec5-49f3-a544-a434298717e4.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7-8b1ba7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/{organizations_7544739_teams_820406-6-20a951.json => organizations_7544739_teams_820406-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/{organizations_github-api-test-org_teams_820406-5-e64007.json => organizations_github-api-test-org_teams_820406-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2-84aa54.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3-d83359.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/{orgs_github-api-test-org_teams_820406-4-e77527.json => orgs_github-api-test-org_teams_820406-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8-9302cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1-59e094.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/{organizations_7544739_team_820406-ba773c31-6b20-4c65-9c67-e9fd89ea6bdd.json => organizations_7544739_team_820406-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/{orgs_github-api-test-org-1e6ccae5-0db6-47c0-89bc-5c1f2d862b63.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/{orgs_github-api-test-org_teams-e2aa00b9-f24e-4650-8341-7f08ec5aea99.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/{user-09eec5a0-4b1d-4afe-85d3-5413eb288548.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4-ba773c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2-1e6cca.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3-e2aa00.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1-09eec5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{repos_bitwiseman_github-api-809893de-22d7-4bad-9e0a-c7b9ff8ee7df.json => repos_bitwiseman_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{repos_bitwiseman_github-api_subscribers-8cec4255-a7a6-484c-ab2f-5c2655d826c9.json => repos_bitwiseman_github-api_subscribers-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{user-9344f7a2-3c3a-427c-a70e-adaad303b0b4.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{user_1958953_repos-bd9bd719-ef4a-483d-b552-0d10fe05981b.json => user_1958953_repos-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{user_1958953_repos-36527ce6-bfd4-43ca-b165-d12ee231b603.json => user_1958953_repos-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{user_1958953_repos-923eca2f-072a-4532-bbd2-7672e5a49011.json => user_1958953_repos-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{user_1958953_repos-6e87f8e2-f745-47ab-884a-4a092e61d385.json => user_1958953_repos-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{user_1958953_repos-9bdd2b94-9737-4def-8b3a-33f8cbf79e20.json => user_1958953_repos-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{users_bitwiseman-695b59f0-b7e7-4239-9389-39e71b040233.json => users_bitwiseman-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/{users_bitwiseman_repos-2be0523d-30fd-42bc-94d1-95926ee70069.json => users_bitwiseman_repos-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2-809893.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3-8cec42.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1-9344f7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10-bd9bd7.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6-36527c.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7-923eca.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8-6e87f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9-9bdd2b.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4-695b59.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5-2be052.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/{user-ce7a016c-62a1-48c6-98c9-5638aaff0074.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/{repos_github-api_github-api-2-1c232f.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/{repos_github-api_github-api_git_trees_master-3-ffd3e3.json => repos_github-api_github-api_git_trees_master-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1-ce7a01.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/__files/{user-813f6f5e-3561-4743-ae0c-ff932c012445.json => user-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2-813f6f.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/{users_bitwiseman_orgs-1-94ce73.json => users_bitwiseman_orgs-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/{user-cb0c811c-52d4-4d1c-878a-2f1c73417d2b.json => user-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/{users_kohsuke_orgs-7ef9c5df-d48e-44be-ba15-e880b8e9558d.json => users_kohsuke_orgs-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2-cb0c81.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1-7ef9c5.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1.json
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/{orgs_github-api-test-org-4eb6084c-7fa6-4d71-a94a-05b226ecf53b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/{repos_github-api-test-org_github-api-6eeaa8d2-6df3-4957-85d6-c2a5abe89738.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/{repos_github-api-test-org_github-api_hooks-bd2a1759-9f96-4bba-a29c-1c7548d113e4.json => repos_github-api-test-org_github-api_hooks-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/{user-3d7769c0-aae6-4946-b6d9-9e2152c52f00.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2-4eb608.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3-6eeaa8.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4-bd2a17.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1-3d7769.json
 create mode 100644 src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler-9019ab15-9d4d-46d6-a771-c22b3a2a9d49.json => repos_stapler_stapler-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits-0d3401ed-a2b4-4de3-82d6-9b95b5341a34.json => repos_stapler_stapler_commits-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-56b0eac8-fa5b-45fa-8ca9-b4fc279933a8.json => repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38.json => repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-e14c2b7e-97c5-4209-b548-c90e00d7a6b9.json => repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-c380c36d-bac3-4be8-8b4f-8693388d7553.json => repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7.json => repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-670b6d74-d1be-4679-8905-94d63b5ee87e.json => repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-5d4638f0-0b7d-4298-93fb-1f563afa687c.json => repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-f3ed2248-279a-4998-86cf-210ed1262fe7.json => repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-e6d566ed-eebd-42d8-86a0-16f113054b3e.json => repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-8aea2962-4bf2-41cd-8137-49b1e6c1e9bb.json => repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/{user-5ed62e6e-2e24-40bf-a0ef-ed960a7ad354.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2-9019ab.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3-0d3401.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-56b0ea.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9-a01b5c.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10-e14c2b.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13-c380c3.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-4c38e9.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6-670b6d.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4-5d4638.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11-f3ed22.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12-e6d566.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5-8aea29.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1-5ed62e.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/{repos_stapler_stapler-dea29c4a-c5b6-460d-8550-09d75d487830.json => repos_stapler_stapler-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/{repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-b564ee52-421b-4d1a-aa96-bdb613581b8a.json => repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/{repos_stapler_stapler_tags-7637217e-0e80-4f8b-bf01-93a7a97952fd.json => repos_stapler_stapler_tags-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/{user-bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2-dea29c.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4-b564ee.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3-763721.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1-bde54f.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler-34276839-6f01-44ea-856d-5b26cc12edf8.json => repos_stapler_stapler-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits-6214feb0-5ed5-4325-8407-2f75bef1c4bd.json => repos_stapler_stapler_commits-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-4fa8c092-5fdf-4ac3-a09a-8713da340f66.json => repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-ad6e998e-9ae1-4bae-9da2-1dd49495d5cb.json => repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7.json => repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-c9650076-4963-4d6a-9c1c-07c6339a48dd.json => repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-b7c821b4-b43e-44a2-bea6-83304ffae91f.json => repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-dd34f14b-38e1-406d-94b8-c650832d9bd4.json => repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-3e6d369c-c2ff-4835-abb3-00858c380485.json => repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-8573f146-63d0-4ffe-9d91-e05573680be5.json => repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-4c78237a-7bc9-49ce-9a1b-0bed99e888b4.json => repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b.json => repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-a7972e0c-a2e0-4e50-bd1a-374cfad5576c.json => repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-d76af952-0ff3-4514-9a38-93d9570c5b3c.json => repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-73ac5fc1-ea49-4c48-bc8a-f306908d7836.json => repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-77b7d93a-9cd6-48a5-af7d-2ee6e4efa296.json => repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-1aa53060-8df1-4455-ae37-21eed443f58b.json => repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-45c73127-9113-4bb6-8193-cedf907fa96a.json => repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-35c73b49-8705-4fee-abd6-36c9f4bc2825.json => repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-fb5ea1a9-6086-40a2-a542-7a87ee6bb437.json => repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-3621ddfb-672d-47aa-8b45-5d15a3e6caaa.json => repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-ca95823a-7ad8-4b14-8d90-c619d98c589f.json => repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/{user-1b6473bc-f679-44ec-8a6a-6a9d036c91aa.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2-342768.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3-6214fe.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-4fa8c0.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9-ad6e99.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10-8ac20a.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11-c96500.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12-dd34f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13-b7c821.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22-3e6d36.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23-8573f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18-4c7823.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19-5f3cc3.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6-d76af9.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-a7972e.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20-73ac5f.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21-77b7d9.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4-45c731.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5-1aa530.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14-35c73b.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15-fb5ea1.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16-3621dd.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17-ca9582.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1-1b6473.json
 create mode 100644 src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/{user-c38b2b92-6669-42ee-838f-7422bb4f300d.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/{repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json => repos_github-api-test-org_temp-testenablebranchprotections-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/{repos_github-api-test-org_temp-testenablebranchprotections-3-040c1d.json => repos_github-api-test-org_temp-testenablebranchprotections-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/{repos_github-api-test-org_temp-testenablebranchprotections-4-aa97cf.json => repos_github-api-test-org_temp-testenablebranchprotections-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1-c38b2b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/{repos_github-api-test-org_temp-testenableprotectiononly-bc30994e-6cf0-42fa-b6e8-7c21803346f0.json => repos_github-api-test-org_temp-testenableprotectiononly-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/{repos_github-api-test-org_temp-testenableprotectiononly_branches_master-88328244-0928-4737-b1a5-674c59027a58.json => repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/{repos_github-api-test-org_temp-testenableprotectiononly_branches_master-90ab1b21-6ee8-4607-bcf5-f14061c3936f.json => repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/{repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-857c661d-4431-4504-9088-c0bbf3a8d667.json => repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/{user-100e4407-70e6-4ea4-aad4-70d93d35dd38.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2-bc3099.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3-883282.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5-90ab1b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4-857c66.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1-100e44.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/{repos_github-api-test-org_temp-testenablerequirereviewsonly-318e0aa4-9fc4-4f30-8174-400001f1bae4.json => repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/{repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-0e0c4c56-198f-4d87-b13e-b146cad7ffdb.json => repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/{user-64a67881-ce5e-4dd2-9d28-af9f67a4d9d1.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2-318e0a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3-0e0c4c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/{repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json => repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1-64a678.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/{repos_github-api-test-org_temp-testsignedcommits-126c7a91-25f8-4610-a015-12535c6f79bd.json => repos_github-api-test-org_temp-testsignedcommits-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/{repos_github-api-test-org_temp-testsignedcommits_branches_master-7a0577f3-c41c-4cbe-9965-f6f53aea602d.json => repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/{repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5.json => repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/{user-94ed9a81-5dda-4f29-8f0b-18eab8a75f14.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2-126c7a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3-7a0577.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4-4b8a92.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/{repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-5-c0150d.json => repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/{repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-6-e29707.json => repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/{repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-7-fa5a0d.json => repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/{repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-8-8c2a08.json => repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/{repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-9-c0efc3.json => repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1-94ed9a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/{user-6cfc78af-700f-404c-aef4-81cb448644d9.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json => repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/{user-34ca1601-0b3c-4808-b51e-b436851e0efd.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/{repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/{user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/{user-afa831d7-4300-49c9-8451-d76fecb86330.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/{repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json => repos_github-api-test-org_ghcontentintegrationtest-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/{user-59f0edb6-895f-402d-946f-77e7511a9a27.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/{repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json => repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/{repos_github-api-test-org_ghcontentintegrationtest-558c17cf-aa4d-452c-8791-7b2f196ef7e1.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/{repos_github-api-test-org_temp-testmimelong-7082490a-244f-4873-bdd9-de2dc4f78d54.json => repos_github-api-test-org_temp-testmimelong-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/{repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-fb14970e-1231-44e3-9e36-9856335a1408.json => repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/{user-e335a3e3-5206-41d0-ae3f-e73676b9cf83.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-558c17.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3-708249.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4-fb1497.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1-e335a3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/{repos_github-api-test-org_ghcontentintegrationtest-9942833c-45f6-4900-b491-bc457756e658.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/{repos_github-api-test-org_temp-testmimelonger-9160729e-acb8-4d03-95b8-dc0482236f2a.json => repos_github-api-test-org_temp-testmimelonger-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/{repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-1ff06594-1fa5-4715-8e13-036b87b43556.json => repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/{user-1a0b1b14-7198-4fde-a559-64c0556a1aec.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-994283.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3-916072.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4-1ff065.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1-1a0b1b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/{repos_github-api-test-org_ghcontentintegrationtest-f60bd9fd-10cc-4488-b2ce-b618cac83ae2.json => repos_github-api-test-org_ghcontentintegrationtest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/{repos_github-api-test-org_temp-testmimesmall-41e8e5a0-d704-4832-87b2-8a5a89cce1a2.json => repos_github-api-test-org_temp-testmimesmall-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/{repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-931cbb72-6e12-4509-bfa6-612dbfaadac0.json => repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/{user-b9d02cd3-311a-4d49-8de8-aa4220400616.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-f60bd9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3-41e8e5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4-931cbb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1-b9d02c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/{orgs_github-api-test-org-4def936c-47fd-43aa-851a-f9dd06f236b5.json => orgs_github-api-test-org-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/{repos_github-api-test-org_github-api-a1a9ff0a-2e37-4803-a9de-fb8fffd45f41.json => repos_github-api-test-org_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/{repos_github-api-test-org_github-api_deployments_178653229-d1d9d992-25e4-4a4b-8710-5b0c57e99a64.json => repos_github-api-test-org_github-api_deployments_178653229-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1-4def93.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2-a1a9ff.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3-d1d9d9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3.json
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/{gists_9903708-c3067d66-2bb0-4af7-b7d4-98032571c5d0.json => gists_9903708-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/{user-9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2-c3067d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1-9226d6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/{gists-2f93eec6-32ad-4c3d-a7bf-33a134d16dbe.json => gists-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/{user-3380f859-169e-41b0-9a8a-aa66277dfb8b.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2-2f93ee.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2.json
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/{gists_9faa55cd67b21a789bb44e34e5e41f72-3-26c314.json => gists_9faa55cd67b21a789bb44e34e5e41f72-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1-3380f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/{gists_9903708-ab2c9d06-edf6-4875-b402-7c99a529b19a.json => gists_9903708-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/{gists_9903708_forks-42d6e404-71e3-42cc-b415-f42dfab9d45e.json => gists_9903708_forks-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/{gists_9903708_forks-992bf599-2e87-4fb0-b610-7c2e1fc00398.json => gists_9903708_forks-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/{user-07500425-69d3-4dd0-8519-628a92aa66c5.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/{gists_8edf855833a05ce8730d609fe8bd803a-9-e0907c.json => gists_8edf855833a05ce8730d609fe8bd803a-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2-ab2c9d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7-42d6e4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8-992bf5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8.json
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/{gists_9903708_star-3-dc6fd4.json => gists_9903708_star-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/{gists_9903708_star-4-680201.json => gists_9903708_star-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/{gists_9903708_star-5-c7d88c.json => gists_9903708_star-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/{gists_9903708_star-6-584dc0.json => gists_9903708_star-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1-075004.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/{gists-fde9aa5a-83fc-41d8-b556-16335859de73.json => gists-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/{gists_209fef72c25fe4b3f673437603ab6d5d-d3ef0c04-12e0-4815-a871-ab7a397b00d7.json => gists_209fef72c25fe4b3f673437603ab6d5d-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1-fde9aa.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2-d3ef0c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2.json
 rename src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/{gists_209fef72c25fe4b3f673437603ab6d5d-3-94cd51.json => gists_209fef72c25fe4b3f673437603ab6d5d-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{orgs_github-api-test-org-0974905b-3de8-4061-bf78-6c18b9b91f54.json => orgs_github-api-test-org-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{repos_github-api-test-org_github-api-ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{repos_github-api-test-org_github-api_issues-218efdaf-b6d8-4161-935b-58bb1ab4d9fb.json => repos_github-api-test-org_github-api_issues-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{repos_github-api-test-org_github-api_issues_313-9895867a-152d-425a-85ab-b7557241c309.json => repos_github-api-test-org_github-api_issues_313-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{repos_github-api-test-org_github-api_issues_313-450e6f09-ae2a-4870-a24d-f7620a437891.json => repos_github-api-test-org_github-api_issues_313-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{repos_github-api-test-org_github-api_issues_313_events-ef9890e7-cc75-4757-afba-42fc12908cd9.json => repos_github-api-test-org_github-api_issues_313_events-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/{repos_github-api-test-org_github-api_issues_events_2704815753-306d4048-2cef-4339-aae4-e03195f651e4.json => repos_github-api-test-org_github-api_issues_events_2704815753-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6-097490.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7-ef3199.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5-218efd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6-989586.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9-450e6f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7-ef9890.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8-306d40.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8.json
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{orgs_github-api-test-org-b27b8752-74a5-4f0d-8d9c-483cb31d4178.json => orgs_github-api-test-org-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repos_github-api-test-org_github-api-2afea771-4bdb-4e32-b0ba-e72ed286f6c2.json => repos_github-api-test-org_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repos_github-api-test-org_github-api_issues_events-d6129252-9f48-4380-babb-cc06baa4234e.json => repos_github-api-test-org_github-api_issues_events-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-83c7abdb-5f08-4826-9313-decbfa7b2531.json => repositories_206888201_issues_events-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-6f0d6963-5006-4dba-b11b-a0408d0f798f.json => repositories_206888201_issues_events-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-208a37ec-cb3d-4d4e-b27f-f6df770111b3.json => repositories_206888201_issues_events-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-94dd8eff-b6f3-4003-89c9-c97721354a77.json => repositories_206888201_issues_events-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1.json => repositories_206888201_issues_events-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-5f55d936-4d74-4c99-bc0d-f3c3a90dd81a.json => repositories_206888201_issues_events-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-4917724b-b110-4549-81b5-c329a13c467a.json => repositories_206888201_issues_events-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-2b6f606b-278c-47b2-99ff-9036f43b0f68.json => repositories_206888201_issues_events-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-72a13002-acc3-4c49-a916-daaf249874b5.json => repositories_206888201_issues_events-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-9c193fd6-e6f6-4949-8414-cf031e70f82e.json => repositories_206888201_issues_events-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-654e008f-d77e-4339-957e-f2bdfcab904b.json => repositories_206888201_issues_events-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-71d7968e-586e-4120-81db-eea6f1aca2f0.json => repositories_206888201_issues_events-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/{repositories_206888201_issues_events-28692783-a6a7-432a-bae1-15bcb4e48175.json => repositories_206888201_issues_events-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1-b27b87.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2-2afea7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3-d61292.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10-83c7ab.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11-6f0d69.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12-208a37.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13-94dd8e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14-b1ad56.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15-5f55d9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16-491772.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4-2b6f60.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5-72a130.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6-9c193f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7-654e00.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8-71d796.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9-286927.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/{licenses_mit-4cc836da-9288-41bd-886c-05c93470225d.json => licenses_mit-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/{repos_github-api_github-api-631120d1-4833-49ea-a8f7-55a6085625ef.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/{repos_github-api_github-api_license-f6ba1895-6c06-4c51-9ad0-fcf322e87ee4.json => repos_github-api_github-api_license-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/{user-eeb32135-bbb9-4c4c-8166-472f24fba13a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4-4cc836.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2-631120.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3-f6ba18.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1-eeb321.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/{repos_github-api_github-api-1f9552cb-0b47-47ca-bb9b-f685d1dbbf05.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/{repos_github-api_github-api_license-b99917fd-7863-4815-8e2e-cd3261475e98.json => repos_github-api_github-api_license-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/{user-659cc231-9415-4c8e-8f9f-153362753343.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2-1f9552.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3-b99917.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1-659cc2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/{repos_atom_atom-bd1153cf-7be6-4147-9e7e-e12a0d7789f2.json => repos_atom_atom-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/{repos_atom_atom_license-a0fac733-4d83-4d68-be23-c1c57574ea10.json => repos_atom_atom_license-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/{user-30af4231-bcac-4e52-8dfe-da122934c709.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2-bd1153.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3-a0fac7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1-30af42.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/{repos_pomes_pomes-7c3e7b36-6930-4804-8d6e-83075abfcde8.json => repos_pomes_pomes-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/{repos_pomes_pomes_license-c59d46f6-2c50-4afd-80b6-40dbfa4dd754.json => repos_pomes_pomes_license-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/{user-767d6575-bd87-4641-a940-a567ff936667.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2-7c3e7b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3-c59d46.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1-767d65.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/__files/{pomes_pomes_master_license-050b93b9-0d3b-4dd2-bde1-a220548659e4.txt => pomes_pomes_master_license-1.txt} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1-050b93.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/{repos_pomes_pomes-c9deed07-bd75-4016-bc8e-ee09b582b604.json => repos_pomes_pomes-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/{repos_pomes_pomes_license-47a3f209-8281-4238-b926-f199992b4cdf.json => repos_pomes_pomes_license-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/{user-f33aa0eb-ef47-4106-b877-b8938a450623.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2-c9deed.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3-47a3f2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1-f33aa0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/{repos_github-api-test-org_empty-ed789279-0e18-43b9-8ee5-4a9a40160834.json => repos_github-api-test-org_empty-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/{user-3003d0dd-7267-40ad-a499-e3fb8ce52a3f.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2-ed7892.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/{repos_github-api-test-org_empty_license-3-fb7ab8.json => repos_github-api-test-org_empty_license-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1-3003d0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/{licenses_mit-2182eadf-58a8-487f-89af-e6f6e8c527fe.json => licenses_mit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/{user-38876ae8-0962-4f1b-97cf-78ca1fb1fcb9.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2-2182ea.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1-38876a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/{licenses-b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8.json => licenses-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/{user-dfe7f772-b859-48ce-919e-54ccde4cdd28.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2-b3d307.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1-dfe7f7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/{licenses-f00fa680-0dd6-401b-a35f-1ed72d7587a7.json => licenses-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/{user-b8102c16-0e43-4f4d-96c1-7d6cfb5981c2.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2-f00fa6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1-b8102c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{orgs_github-api-test-org-fdbcaf38-478b-440a-851a-b5913757f6f3.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{repos_github-api-test-org_github-api-701999a2-14ad-4078-ab89-b0f722cbc52f.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{repos_github-api-test-org_github-api_milestones-a7ebf1ae-cbbb-4c59-8844-6888ad2493ba.json => repos_github-api-test-org_github-api_milestones-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{repos_github-api-test-org_github-api_milestones_2-80930c65-6614-40e9-8cfb-51244eb49764.json => repos_github-api-test-org_github-api_milestones_2-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{repos_github-api-test-org_github-api_milestones_2-865125bf-0f31-4650-b668-9d5d72c47680.json => repos_github-api-test-org_github-api_milestones_2-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{repos_github-api-test-org_github-api_milestones_2-b24a5b3a-76c0-44f6-950b-d0fdec878349.json => repos_github-api-test-org_github-api_milestones_2-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{repos_github-api-test-org_github-api_milestones_2-fffe46e8-0b2e-4195-8e42-857e3127cd0b.json => repos_github-api-test-org_github-api_milestones_2-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/{user-7feb269c-7db0-4c3f-8c58-f99bdf1cafe8.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2-fdbcaf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3-701999.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4-a7ebf1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5-80930c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6-865125.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7-b24a5b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8-fffe46.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1-7feb26.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/{orgs_github-api-test-org-11718658-38aa-4629-bcf3-48d5ca5fd31b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/{user-1609473b-b4ea-4a80-85dd-2c77586f7683.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2-117186.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1-160947.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/{orgs_github-api-test-org-b4a28742-c15b-4b7d-a6ce-45b33efa8289.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/{orgs_github-api-test-org_teams-6d91c5d6-a8a1-4693-9b2a-dc136570b11b.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/{user-b4c30850-48c1-46f6-83a4-52b7a1ff4765.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2-b4a287.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3-6d91c5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1-b4c308.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/{orgs_github-api-test-org-cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/{orgs_github-api-test-org_repos-43cfd527-8dc8-4025-ab6f-41f6c45a86bd.json => orgs_github-api-test-org_repos-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/{orgs_github-api-test-org_teams-beb3badb-dca2-4515-9c19-9ba8401f98f4.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/{user-58ae6686-1748-4884-8b04-c483ac0bf048.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2-cf0714.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4-43cfd5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3-beb3ba.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1-58ae66.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/{orgs_github-api-test-org-7b0ac54c-1ef0-453a-99db-a480b3b5a746.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/{orgs_github-api-test-org_repos-423c774e-3d61-423a-ad0d-ee166bf2b4de.json => orgs_github-api-test-org_repos-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/{orgs_github-api-test-org_teams-eb06b2d9-1dda-4070-bdfe-3005f550e7ec.json => orgs_github-api-test-org_teams-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/{repos_github-api-test-org_github-api-test_readme-12092c16-85de-454a-80ae-61c283738838.json => repos_github-api-test-org_github-api-test_readme-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/{user-d246cfb6-e28a-417b-8d74-29080bbc1c4c.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2-7b0ac5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4-423c77.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3-eb06b2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5-12092c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1-d246cf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/{orgs_github-api-test-org-b46fc09e-f6b1-470b-b070-d37c25eb5096.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/{orgs_github-api-test-org_teams-93bbb3e2-5dd1-41f1-b527-1e431a0213b7.json => orgs_github-api-test-org_teams-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/{repos_github-api-test-org_github-api-8907242a-a66e-45d4-a01e-3f12bfa099a2.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/{teams_3531422_repos-9893d54e-bc2f-4246-ba25-b9c157b22845.json => teams_3531422_repos-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/{user-3a6b16d8-0d7e-4409-bb25-07ac6103a4fd.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2-b46fc0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4-93bbb3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3-890724.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5-9893d5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1-3a6b16.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/{orgs_github-api-test-org-8c23f18e-d928-4e88-851d-fa36feecf615.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/{orgs_github-api-test-org_teams-3459b05f-6e47-4c41-be60-83c125bf180b.json => orgs_github-api-test-org_teams-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/{repos_github-api-test-org_github-api-25876edf-6351-4b59-9e1d-82886a02f721.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/{teams_3501817_repos-97bad23b-9d25-4db2-8420-afbc40b450ac.json => teams_3501817_repos-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/{user-8620f09e-7f34-4e00-860b-335d22d56f92.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2-8c23f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4-3459b0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3-25876e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5-97bad2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1-8620f0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/{orgs_github-api-test-org-6480b3f7-e3e1-4a01-98fb-ca85b6ea4099.json => orgs_github-api-test-org-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/{orgs_github-api-test-org_members-e0db340d-7d23-488e-9858-6e71ed5a4c84.json => orgs_github-api-test-org_members-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/{orgs_github-api-test-org_memberships_martinvanzijl2-d8831e1a-2b63-4d3f-82b2-87f4d14116f3.json => orgs_github-api-test-org_memberships_martinvanzijl2-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/{user-7e6e7d53-a5ae-46b0-afc0-a73258da075d.json => user-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/{users_martinvanzijl2-26b89bbe-835e-4bf6-b60a-bc32177b3fdb.json => users_martinvanzijl2-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1-6480b3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2-e0db34.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/{orgs_github-api-test-org_members_martinvanzijl2-4-885640.json => orgs_github-api-test-org_members_martinvanzijl2-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5-d8831e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6-7e6e7d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3-26b89b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/{orgs_github-api-test-org-3ed48345-73c2-4d8e-9c65-f4a140356d59.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/{orgs_github-api-test-org_members-ef9f50f7-160c-4410-a82e-68d3e14fb250.json => orgs_github-api-test-org_members-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/{user-9e0ec7a6-d16f-4198-b2e6-ed290e9d780d.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2-3ed483.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3-ef9f50.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1-9e0ec7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/{orgs_github-api-test-org-6682f58b-c93b-4525-9e99-485e631aaaab.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/{orgs_github-api-test-org_members-80be661d-6679-43df-9ced-eb3b78827280.json => orgs_github-api-test-org_members-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/{user-a3604d73-d76d-4f3e-8f7f-cecee94c5cef.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2-6682f5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3-80be66.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1-a3604d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/{orgs_github-api-test-org-13f85dbd-5b52-49ce-b65b-bac7d3069c78.json => orgs_github-api-test-org-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/{repos_github-api-test-org_github-api-b3a3dea9-68c7-40d4-8f70-3dddff42e983.json => repos_github-api-test-org_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/{users_github-api-test-org-9edc4a69-96e0-4db6-8469-85483d9ef2c5.json => users_github-api-test-org-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1-13f85d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2-b3a3de.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3-9edc4a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3.json
 rename src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/__files/{users_kohsuke2-be47bccc-9404-4fe4-be81-ae86857a3c99.json => users_kohsuke2-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1-be47bc.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{orgs_github-api-test-org-8a33ed8f-a98f-47af-a4e7-a30928da2e70.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{orgs_github-api-test-org_projects-b659e68a-af69-4413-a2fa-602524428990.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{projects_3312444_columns-3be146c4-9f97-4b2d-9951-16dd86ec334f.json => projects_3312444_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{projects_columns_6706801_cards-45bdd9f0-5efe-43c3-b01f-130894549d0d.json => projects_columns_6706801_cards-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{projects_columns_cards_27353270-75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac.json => projects_columns_cards_27353270-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{projects_columns_cards_27353270-97fd6c7d-30b2-4036-9d02-b3be29a2c045.json => projects_columns_cards_27353270-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/{user-0c7200e4-cdc5-45a5-997a-d7b8568751cf.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2-8a33ed.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3-b659e6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4-3be146.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5-45bdd9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6-97fd6c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7-75b0d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1-0c7200.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{orgs_github-api-test-org-2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{orgs_github-api-test-org_projects-bac54b7b-af26-4015-85d1-97d981800e06.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{orgs_github-api-test-org_repos-c2d81922-c3f6-41b3-b109-de8cfe1452a6.json => orgs_github-api-test-org_repos-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{projects_3312449_columns-5b504083-4657-4d27-aaff-54f97a361d7a.json => projects_3312449_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{projects_columns_6706803_cards-e6d34d34-6779-4c36-83e1-b783989750c3.json => projects_columns_6706803_cards-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{projects_columns_6706803_cards-6458c399-0897-43a0-a869-f43a56e32cae.json => projects_columns_6706803_cards-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{repos_github-api-test-org_repo-for-project-card_issues-29d82e53-34b8-4443-bddd-fdd14726484d.json => repos_github-api-test-org_repo-for-project-card_issues-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/{user-b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2-2cd475.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3-bac54b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6-c2d819.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4-5b5040.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5-e6d34d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8-6458c3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/{repos_github-api-test-org_repo-for-project-card-9-372cc0.json => repos_github-api-test-org_repo-for-project-card-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7-29d82e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1-b9c4ba.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/{orgs_github-api-test-org-a73c2760-fcb1-4ad6-a379-508ae8bd6a92.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/{orgs_github-api-test-org_projects-fd95c811-2dc4-458b-a18f-72b93e2cfac7.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/{projects_3312442_columns-264f75eb-2b63-4727-9470-21079137ecf4.json => projects_3312442_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/{projects_columns_6706799_cards-0a15ceb0-700f-41b0-8a07-ac04dcdcd13f.json => projects_columns_6706799_cards-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/{user-80e34816-e0ac-422b-807b-bc8c1f2bd313.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2-a73c27.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3-fd95c8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4-264f75.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5-0a15ce.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1-80e348.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/{orgs_github-api-test-org-467a3990-86b4-4c0f-9d2a-e51630e548f6.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/{orgs_github-api-test-org_projects-491fbbf4-d8d0-433d-9ec6-162fa95ad792.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/{projects_3312447_columns-f80b3261-cf13-4bcf-82b7-19a1425cbe78.json => projects_3312447_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/{projects_columns_6706802_cards-aad1d69e-1823-41cc-9cb0-fac06faa77c3.json => projects_columns_6706802_cards-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/{user-c2f32bbc-aa66-407b-a3e3-4533d04dd4b0.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2-467a39.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3-491fbb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4-f80b32.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5-aad1d6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/{projects_columns_cards_27353272-6-e93cbd.json => projects_columns_cards_27353272-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/{projects_columns_cards_27353272-7-a7094f.json => projects_columns_cards_27353272-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1-c2f32b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{orgs_github-api-test-org-049038eb-8cc8-4480-b0e9-62a6bb55f112.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{orgs_github-api-test-org_projects-68e871e2-343e-47b7-aa45-b613ef9f8bc0.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{projects_3312443_columns-1de47f2e-9018-4a4f-9dad-0ee29614aa4e.json => projects_3312443_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{projects_columns_6706800_cards-695ce51a-3df9-4aea-b10d-471d3ff856b8.json => projects_columns_6706800_cards-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{projects_columns_cards_27353267-62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f.json => projects_columns_cards_27353267-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{projects_columns_cards_27353267-93c5d233-0602-432f-a6a1-784506a19fe0.json => projects_columns_cards_27353267-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/{user-355d682a-6ab6-4af5-be72-d00bf6403051.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2-049038.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3-68e871.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4-1de47f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5-695ce5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6-62a0d7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7-93c5d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1-355d68.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/{orgs_github-api-test-org-7feb4202-bd04-498e-a28c-fd9df44d8fc8.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/{orgs_github-api-test-org_projects-42bd7d98-f969-40ce-bb9a-1586c556569d.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/{projects_3312440_columns-eb58635e-11b9-461d-8868-6ece3733f962.json => projects_3312440_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/{user-ff30f972-21ad-40ee-aa60-c006643154d2.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2-7feb42.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3-42bd7d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4-eb5863.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1-ff30f9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/{orgs_github-api-test-org-f4a0595a-a719-4b21-bf67-f12d67bac972.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/{orgs_github-api-test-org_projects-bfb7de93-74a1-48dc-a74a-ba06cee9e764.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/{projects_3312441_columns-fb6e53a0-db62-4037-8f0b-3511e79bea93.json => projects_3312441_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/{user-f818b667-7eed-4efb-9719-ea27f8d05b59.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2-f4a059.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3-bfb7de.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4-fb6e53.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4.json
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/{projects_columns_6706794-5-8c0cae.json => projects_columns_6706794-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/{projects_columns_6706794-6-112e1e.json => projects_columns_6706794-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1-f818b6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/{orgs_github-api-test-org-eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/{orgs_github-api-test-org_projects-97b70b32-45f4-419f-87d0-f15a2c004196.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/{projects_3312439_columns-082ed3d1-bea6-48fc-8e61-a63c4d0db977.json => projects_3312439_columns-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/{projects_columns_6706791-1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17.json => projects_columns_6706791-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/{projects_columns_6706791-85f35660-6579-4bea-af53-b636239dd5cd.json => projects_columns_6706791-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/{user-e21e45b0-f34c-473e-9454-cb601fb759b9.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2-eb0425.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3-97b70b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4-082ed3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5-85f356.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6-1cfa5d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1-e21e45.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/{orgs_github-api-test-org-713f01eb-4f07-4f02-89fe-e7560ed08e11.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/{orgs_github-api-test-org_projects-e5afd90e-d2ac-4e83-800d-a680bc27c9ed.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/{user-a9a3d26a-4c87-4ebf-9609-48b2120173b7.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2-713f01.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3-e5afd9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1-a9a3d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/{orgs_github-api-test-org-c3024047-fc8f-443f-a2b4-810324f889b4.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/{orgs_github-api-test-org_projects-daa6c228-6e0f-4398-a6d2-2d114f986e93.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/{user-9cb86722-7ae5-46b2-8598-59567e17ed99.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2-c30240.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3-daa6c2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3.json
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/{projects_3312437-4-f50762.json => projects_3312437-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/{projects_3312437-5-8b8e6f.json => projects_3312437-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1-9cb867.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/{orgs_github-api-test-org-2e39c772-c889-44d1-bf15-5248ad194202.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/{orgs_github-api-test-org_projects-08231b0e-288f-49fa-aa2b-9456449d2cfd.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/{projects_3312435-004d3495-63b2-40e7-a864-10d175a59756.json => projects_3312435-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/{projects_3312435-76e0c251-b1df-4f18-8a01-77a7bbc15474.json => projects_3312435-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/{user-b2b1262a-1678-4080-af72-92346bb25688.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2-2e39c7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3-08231b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4-004d34.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5-76e0c2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1-b2b126.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/{orgs_github-api-test-org-e3d87fca-b817-4dfb-b80f-99eebaabba08.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/{orgs_github-api-test-org_projects-6a0a4669-8d74-4fa9-92c0-0fa428078637.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/{projects_3312436-20ac7f07-9e2b-47dd-801c-67974592a3b9.json => projects_3312436-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/{projects_3312436-6c28d544-7193-4c9d-93a8-5c4bd20af717.json => projects_3312436-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/{user-115e6194-ffb3-4129-8f7b-ad60f5fff91a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2-e3d87f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3-6a0a46.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4-20ac7f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5-6c28d5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1-115e61.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/{orgs_github-api-test-org-a522b55e-f089-4a29-a55e-33f0744eca1a.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/{orgs_github-api-test-org_projects-ee429eb6-b010-4916-91af-3ce0976426dd.json => orgs_github-api-test-org_projects-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/{projects_3312433-55b16b4e-924d-4cf7-9113-fbc644011a44.json => projects_3312433-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/{projects_3312433-715884a8-0610-43b5-9379-01ac91168ec0.json => projects_3312433-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/{user-f7605e5c-c728-4af9-baca-a6e1266d1b4a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2-a522b5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3-ee429e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4-55b16b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5-715884.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1-f7605e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{orgs_github-api-test-org-24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api-b2a37888-a485-466a-90a1-b56337178b1c.json => repos_github-api-test-org_github-api-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api-0f9ebc51-ad67-49b7-b75c-ee2421880f0a.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api-1db0407d-2e07-4407-810e-486b374e8f3e.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api-d6b189f8-494a-48df-bb5b-0756c8396db0.json => repos_github-api-test-org_github-api-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api_pulls-607242b1-1d80-46f6-90f0-87c455668f63.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api_pulls_272-480ea0b0-4d44-4e09-a652-6551a3613019.json => repos_github-api-test-org_github-api_pulls_272-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api_pulls_272-601780dc-d673-40e8-bc22-76005fce61c3.json => repos_github-api-test-org_github-api_pulls_272-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{repos_github-api-test-org_github-api_pulls_272-64929638-544b-4052-8139-da249d59952e.json => repos_github-api-test-org_github-api_pulls_272-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/{user-b08f022a-37f2-4191-bbef-d348f1330beb.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2-24dc8a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10-b2a378.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3-0f9ebc.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5-1db040.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8-d6b189.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/{repos_github-api-test-org_github-api_pulls-11-c7f9dd.json => repos_github-api-test-org_github-api_pulls-11.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-607242.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6-480ea0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7-601780.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9-649296.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1-b08f02.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{orgs_github-api-test-org-449cef5e-5c83-4133-b824-a0d152c31d3d.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{repos_github-api-test-org_github-api-260db58e-2811-405d-b33f-49b598ae4bc5.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{repos_github-api-test-org_github-api_pulls-f9c86da0-31ab-4da8-925c-f45241f78cb6.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{repos_github-api-test-org_github-api_pulls-40b2ed6a-5cf1-425a-80cc-72805839ac0e.json => repos_github-api-test-org_github-api_pulls-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{repos_github-api-test-org_github-api_pulls_321-91de84e3-deb6-40a3-8684-7d9752767396.json => repos_github-api-test-org_github-api_pulls_321-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{repos_github-api-test-org_github-api_pulls_321-b01981ed-7e57-46f9-af4b-8571bd6cedcf.json => repos_github-api-test-org_github-api_pulls_321-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{repos_github-api-test-org_github-api_pulls_321-ec3d9059-949c-4244-830a-41beea0ddb2b.json => repos_github-api-test-org_github-api_pulls_321-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/{user-26b175e4-5fd3-40c9-b4f2-f8fd982edf1a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2-449cef.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3-260db5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-f9c86d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7-40b2ed.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5-91de84.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6-b01981.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8-ec3d90.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1-26b175.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{orgs_github-api-test-org-b2d80ea5-16e2-42ed-9de1-71ed44de990a.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{repos_github-api-test-org_github-api-e04f90b8-9e4c-42f6-867c-1d729dcdf83f.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{repos_github-api-test-org_github-api-31587743-aa9c-4bdd-8e99-6d2603914f13.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{repos_github-api-test-org_github-api_pulls-e393556d-0f08-48c2-9ec1-ecebeced216a.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{repos_github-api-test-org_github-api_pulls-21bacc38-2501-4be1-a5ed-63d59668aecf.json => repos_github-api-test-org_github-api_pulls-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{repos_github-api-test-org_github-api_pulls_273-66712670-b79b-48e8-8593-01f7564ff169.json => repos_github-api-test-org_github-api_pulls_273-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/{user-17990d92-81a4-43e2-b41b-bf3f95f79276.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2-b2d80e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3-e04f90.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5-315877.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-e39355.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6-21bacc.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7-667126.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1-17990d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{orgs_github-api-test-org-ad4f3477-141d-413d-aae6-d8d877f4359c.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{repos_github-api-test-org_github-api-de7260bc-cad0-4eeb-ab76-129228a40fa4.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{repos_github-api-test-org_github-api-6e0179a4-9d47-4435-897a-ca80019c4ee1.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{repos_github-api-test-org_github-api_issues_270_comments-2cd4dd92-58d7-4423-bbe8-babe22bd36ac.json => repos_github-api-test-org_github-api_issues_270_comments-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{repos_github-api-test-org_github-api_pulls-4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{repos_github-api-test-org_github-api_pulls-420dc28a-cfc8-4fbc-8cef-7123c0387966.json => repos_github-api-test-org_github-api_pulls-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{repos_github-api-test-org_github-api_pulls_270-1a6fbb20-8969-454a-94be-1e24388e7ed4.json => repos_github-api-test-org_github-api_pulls_270-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/{user-c4d4d68f-a141-4fad-a2c9-539e3a21fe94.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2-ad4f34.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3-de7260.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6-6e0179.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5-2cd4dd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4-4e9dad.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7-420dc2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8-1a6fbb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1-c4d4d6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{orgs_github-api-test-org-9700f9b4-6787-4942-94bd-1e47116da93b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api-c0d68f0b-8041-4a02-902c-e277971f2364.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api-e79ad56e-9598-45d0-854b-d3b1596e0bf0.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api-43e6882d-8843-479b-8da0-0de90a6edc39.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api-ab230383-b8a2-4e18-848c-31637758036c.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api_pulls-5f8eb032-94f9-4306-922e-21141d15228b.json => repos_github-api-test-org_github-api_pulls-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api_pulls-344c3bf1-68d8-4ed4-8d28-31f06f7ef465.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api_pulls-e32f79db-5f0b-4b94-b7ee-540ef61d9fc2.json => repos_github-api-test-org_github-api_pulls-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api_pulls_263-efb36413-ff3e-4b8b-af82-e5fe336051e8.json => repos_github-api-test-org_github-api_pulls_263-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{repos_github-api-test-org_github-api_pulls_263-034f14a1-2ee6-4451-b553-d02da875468e.json => repos_github-api-test-org_github-api_pulls_263-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/{user-07979842-29a1-401d-be2b-0c5847525fc3.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2-9700f9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3-c0d68f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5-e79ad5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7-43e688.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9-ab2303.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10-5f8eb0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4-344c3b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8-e32f79.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11-efb364.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6-034f14.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1-079798.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json => repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json => repos_github-api-test-org_github-api_pulls_309-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json => repos_github-api-test-org_github-api_pulls_309-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json => repos_github-api-test-org_github-api_pulls_309-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/{user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{orgs_github-api-test-org-079c3da5-3ce3-41f6-aef1-cae0dad71a85.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api-9090d20b-28ee-455a-8eb6-e1547d0d3d9e.json => repos_github-api-test-org_github-api-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api-d585b5ae-36a9-48d8-931d-7f459bec2b4c.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls-80451be1-8c40-4a4b-9144-c59e9fb97fd8.json => repos_github-api-test-org_github-api_pulls-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls-145b4497-4f76-4adf-b16b-ccf1f68c339d.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls_266-f8bf7bf6-b583-4573-b3eb-31bbad80e965.json => repos_github-api-test-org_github-api_pulls_266-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls_266_comments-b9a8cb45-f232-4aa9-a3bf-93f050e40616.json => repos_github-api-test-org_github-api_pulls_266_comments-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls_266_comments-874427ac-ddf2-4cee-b85c-501b2a3861d7.json => repos_github-api-test-org_github-api_pulls_266_comments-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls_266_comments-8d629bc2-ccf8-46c5-804d-500af333a156.json => repos_github-api-test-org_github-api_pulls_266_comments-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{repos_github-api-test-org_github-api_pulls_comments_321995146-d0df7515-482f-4337-aafd-a543346e6076.json => repos_github-api-test-org_github-api_pulls_comments_321995146-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/{user-f7421985-e210-4b76-b07e-0a00bae61fff.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2-079c3d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12-9090d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3-d585b5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13-80451b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4-145b44.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14-f8bf7b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/{repos_github-api-test-org_github-api_pulls_266_comments-11-b8142f.json => repos_github-api-test-org_github-api_pulls_266_comments-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/{repos_github-api-test-org_github-api_pulls_266_comments-5-cbd425.json => repos_github-api-test-org_github-api_pulls_266_comments-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6-b9a8cb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7-874427.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9-8d629b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/{repos_github-api-test-org_github-api_pulls_comments_321995146-10-73e6aa.json => repos_github-api-test-org_github-api_pulls_comments_321995146-10.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8-d0df75.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1-f74219.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{orgs_github-api-test-org-3f761467-4b55-4250-8764-14a1f83cdf7b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api-029a5710-e19a-4db2-8b79-49123309a3bf.json => repos_github-api-test-org_github-api-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api-1efd2ad4-e334-47e1-aaa8-8588bb117bb0.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls-0c75c020-a12d-4d29-a43f-401e5d479b4a.json => repos_github-api-test-org_github-api_pulls-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls-7f209593-4b8d-4fc8-97e2-10704e6683b7.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258-9406e54b-fdf7-40d5-a51b-3c27d7b050d8.json => repos_github-api-test-org_github-api_pulls_258-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258_reviews-1fe517d8-5707-4f17-a46a-e58d3abb5991.json => repos_github-api-test-org_github-api_pulls_258_reviews-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258_reviews-56d54933-fb91-4e3e-8baa-245b5b7db8b2.json => repos_github-api-test-org_github-api_pulls_258_reviews-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258_reviews-be8b553c-77cf-4904-9d74-92787d422007.json => repos_github-api-test-org_github-api_pulls_258_reviews-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-15c1e28b-6415-4c72-8a9a-bf0e88ca9364.json => repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-d0f59a93-6a4d-4841-b4ec-a6b5d43747ea.json => repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{repos_github-api-test-org_github-api_pulls_258_reviews_285200957-886b3f8b-a7c0-4844-95a5-3f674898edb0.json => repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/{user-e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2-3f7614.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11-029a57.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3-1efd2a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12-0c75c0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4-7f2095.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13-9406e5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5-1fe517.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6-56d549.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9-be8b55.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8-15c1e2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7-d0f59a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10-886b3f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1-e24b33.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{orgs_github-api-test-org-9de3bb03-9dd4-4b5a-a2ac-20e02c951355.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api-f81e5019-7e7f-48df-803a-d47defd3f22d.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api-684ed3a1-dca4-42f3-b25a-ebea733d4a02.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-a2c01b93-3f63-418c-bd0b-a5a61b96999f.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-9afc3aa9-ac54-4c53-b5e3-3c0793558359.json => repos_github-api-test-org_github-api_pulls-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-ab74613d-0613-47a8-a6fc-34add77d9967.json => repos_github-api-test-org_github-api_pulls-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-4e73cd50-9986-426e-bf13-b7ad18f36be0.json => repos_github-api-test-org_github-api_pulls-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api_pulls_259-5f1852a8-2f93-46f0-a692-538bb386c436.json => repos_github-api-test-org_github-api_pulls_259-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{repos_github-api-test-org_github-api_pulls_260-6162e3a9-487d-475a-a4e1-f037c796baf5.json => repos_github-api-test-org_github-api_pulls_260-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/{user-4966fe2a-d81e-4b83-acd4-b1c3e2f4f684.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2-9de3bb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3-f81e50.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7-684ed3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-a2c01b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-9afc3a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-ab7461.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-4e73cd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10-5f1852.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9-6162e3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1-4966fe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{orgs_github-api-test-org-80e70ac1-7d85-4431-a004-1c16dd3def5c.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api-10e587d7-cc44-4965-a559-261991a6a1d7.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api-db8422da-0a10-42a5-94f4-3c694b2baaf0.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-cc03923a-acb0-4c40-ae5a-3d7a9b406ce3.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-37334410-0027-4784-b4d5-4a1e4b6e3174.json => repos_github-api-test-org_github-api_pulls-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-3d58d4ba-d752-421e-acdc-6fea50e3311a.json => repos_github-api-test-org_github-api_pulls-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api_pulls-cfa90ef7-9496-4f77-b239-adf88ad5dd64.json => repos_github-api-test-org_github-api_pulls-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api_pulls_268-08817e59-cbfd-4e89-9e60-707e4ee940e6.json => repos_github-api-test-org_github-api_pulls_268-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{repos_github-api-test-org_github-api_pulls_269-b5427c9e-53f5-4301-a757-4c9a349ee97d.json => repos_github-api-test-org_github-api_pulls_269-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/{user-69a2a995-8642-477e-aafe-59a7869f4ae9.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2-80e70a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3-10e587.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7-db8422.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-cc0392.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-373344.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-3d58d4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-cfa90e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9-08817e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10-b5427c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1-69a2a9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{orgs_github-api-test-org-41c140fe-0c07-406f-8a11-c8c4dad3ff91.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api-f25bc1c4-0789-481f-bedf-b02bb58709b7.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api-6415bdcd-1b83-46fb-99b8-1e93bb21ecc4.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api-d2df6fea-d463-4b4e-ac13-024bf488bfcf.json => repos_github-api-test-org_github-api-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api_issues_271-9171d903-c9bb-400b-b09f-a95f1f7d9c03.json => repos_github-api-test-org_github-api_issues_271-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api_pulls-8c712317-17a5-4e10-9463-61ef2564a0b7.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api_pulls-aee9a7ec-9886-48b9-b8bc-f57480b183ab.json => repos_github-api-test-org_github-api_pulls-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api_pulls_271-ff9fa198-2c33-4554-826e-5a2ec150d1c9.json => repos_github-api-test-org_github-api_pulls_271-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{repos_github-api-test-org_github-api_pulls_271-844a4111-bda7-4086-affc-96fa7cf053d0.json => repos_github-api-test-org_github-api_pulls_271-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/{user-27e10619-a669-4ec6-8270-519114eef6f6.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2-41c140.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3-f25bc1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6-6415bd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8-d2df6f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5-9171d9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4-8c7123.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9-aee9a7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10-ff9fa1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7-844a41.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1-27e106.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{orgs_github-api-test-org-04e11278-2441-4a15-9491-102d5e142409.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api-1b1c6847-2cda-47ec-a736-79672a3a7abe.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api-4e2383e2-109f-4ba8-910a-e6fa057728fe.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api-caba7863-7e0a-48ed-b54d-e6121b595280.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api_issues_264-1421d6dd-ddf5-44ca-a50e-03848f69af20.json => repos_github-api-test-org_github-api_issues_264-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api_issues_264-52c0826c-b7a4-47a7-a202-505128247a5e.json => repos_github-api-test-org_github-api_issues_264-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api_pulls-bd497d3d-3712-4ea7-9e01-2810bf2b83c8.json => repos_github-api-test-org_github-api_pulls-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api_pulls-7af49b84-1732-4a74-b123-676769146f83.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api_pulls_264-cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4.json => repos_github-api-test-org_github-api_pulls_264-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{repos_github-api-test-org_github-api_pulls_264-4627827c-55fb-4f0c-850d-23fd6b35b4f7.json => repos_github-api-test-org_github-api_pulls_264-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/{user-946afcfe-31ac-4f28-9d66-5f45ffbb3a7c.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2-04e112.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3-1b1c68.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6-4e2383.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9-caba78.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5-52c082.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8-1421d6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10-bd497d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4-7af49b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11-cfd2cf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7-462782.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1-946afc.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{orgs_github-api-test-org-b35d6e1e-890c-4df6-9935-5c2394a76916.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api-5f283241-c895-49c8-92a5-f578369b853b.json => repos_github-api-test-org_github-api-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api-6395c5e1-f2ec-4642-923d-9aebee203afe.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api-957364c8-87d8-4b0d-aad4-396ad3fed253.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api-3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api-7331ed24-bb2d-46a6-a842-986f52a91a5e.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api_contents_squashmerge-04ae8436-0239-47f1-9e0a-4c2987ca1378.json => repos_github-api-test-org_github-api_contents_squashmerge-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api_git_refs-9d910f89-f71e-441d-8781-cba77a54dd08.json => repos_github-api-test-org_github-api_git_refs-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api_git_refs_heads_master-7bfa9315-c036-44af-bc3c-1e639325a8fe.json => repos_github-api-test-org_github-api_git_refs_heads_master-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{repos_github-api-test-org_github-api_pulls-d149e4dc-e134-4376-8b93-ce784a868247.json => repos_github-api-test-org_github-api_pulls-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/{user-b37e46bb-87be-4613-88c7-dcba8c693074.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2-b35d6e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12-5f2832.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3-957364.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5-6395c5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7-3bd5c3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9-7331ed.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8-04ae84.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-9d910f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-7bfa93.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10-d149e4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/{repos_github-api-test-org_github-api_pulls-13-1f5294.json => repos_github-api-test-org_github-api_pulls-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/{repos_github-api-test-org_github-api_pulls_267_merge-11-504d0b.json => repos_github-api-test-org_github-api_pulls_267_merge-11.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1-b37e46.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{orgs_github-api-test-org-4b062368-3c1a-4ed9-8d16-f15b4bfadd20.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{repos_github-api-test-org_github-api-cafd015e-b65c-41a6-9dc9-81b48e9bf803.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{repos_github-api-test-org_github-api_pulls-e7589ec2-0f9c-4b08-a559-0f019f425217.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{repos_github-api-test-org_github-api_pulls_299-59c3756e-2f08-4be6-bbe4-bd4725f6f27b.json => repos_github-api-test-org_github-api_pulls_299-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{repos_github-api-test-org_github-api_pulls_299_requested_reviewers-38f8763a-b045-43de-a850-e58b7b117590.json => repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{user-77ed943e-b741-40d5-bc1e-4414411ca129.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/{users_kohsuke2-8bcfc03d-57d3-4728-a550-9a7375923fa0.json => users_kohsuke2-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2-4b0623.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3-cafd01.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-e7589e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7-59c375.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6-38f876.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1-77ed94.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5-8bcfc0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{orgs_github-api-test-org-8634de25-3d3d-47a6-a72a-de26a5190ce6.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{orgs_github-api-test-org_teams-b84882f2-4778-47cb-bced-70eced02e28b.json => orgs_github-api-test-org_teams-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{orgs_github-api-test-org_teams_dummy-team-7052eece-1708-4d47-8f66-5d45136c43e6.json => orgs_github-api-test-org_teams_dummy-team-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{repos_github-api-test-org_github-api-92a8e470-1b50-4f84-a580-94b8cc1aa3b0.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{repos_github-api-test-org_github-api_pulls-f9eb4ced-224a-4b9c-b9e6-fc98bdd40345.json => repos_github-api-test-org_github-api_pulls-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{repos_github-api-test-org_github-api_pulls_304-e091cbaf-316c-4092-8205-a0d35b299a8e.json => repos_github-api-test-org_github-api_pulls_304-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{repos_github-api-test-org_github-api_pulls_304_requested_reviewers-7df56994-6c47-49ba-8563-e1fd22adf795.json => repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{teams_3451996-112cf6bd-f585-4cec-9ab9-f987a3704a98.json => teams_3451996-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/{user-c23a7fbe-af40-42fe-936e-b94485a32618.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2-8634de.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5-b84882.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9-7052ee.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3-92a8e4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-f9eb4c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7-e091cb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6-7df569.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8-112cf6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1-c23a7f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{orgs_github-api-test-org-ad1f5840-8218-409f-a4da-7f3533b80a39.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api-2621291f-e181-41b0-98ad-3caf5f4fcf63.json => repos_github-api-test-org_github-api-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api-ab64951f-76cf-4bcb-a38a-497717b29f96.json => repos_github-api-test-org_github-api-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api-5e4301dc-40ac-40eb-8424-8ac1bf7a8861.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api-620a6cec-3b31-4ac7-94be-d162928d0e11.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api-3baea02b-9467-4f17-8b8c-369bd4eca9e2.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api-ea77125d-4094-4cd9-bfbe-da1696813034.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-70ad84cc-ff4b-4567-95cd-eed864ce2fb3.json => repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-1d6973ab-2bb2-4661-a449-6a3baf0da673.json => repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api_git_refs-778d6679-3928-4f4c-beda-b8f1ae11aac3.json => repos_github-api-test-org_github-api_git_refs-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api_git_refs_heads_master-fa77be60-4286-4610-bff6-3ab0bac74b1f.json => repos_github-api-test-org_github-api_git_refs_heads_master-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{repos_github-api-test-org_github-api_pulls-c55f0814-cb1e-4b41-a74d-e94e3eb0e843.json => repos_github-api-test-org_github-api_pulls-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/{user-78c0481f-0420-45ef-97f7-fabf21edf0e2.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2-ad1f58.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11-262129.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14-ab6495.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3-5e4301.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5-620a6c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7-3baea0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9-ea7712.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10-70ad84.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8-1d6973.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-778d66.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-fa77be.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12-c55f08.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12.json
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/{repos_github-api-test-org_github-api_pulls-15-ac16f4.json => repos_github-api-test-org_github-api_pulls-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/{repos_github-api-test-org_github-api_pulls_261_merge-13-0b05c7.json => repos_github-api-test-org_github-api_pulls_261_merge-13.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1-78c048.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/{orgs_github-api-test-org-7ea37b72-8b01-4ed5-a63d-98d32b2faa0f.json => orgs_github-api-test-org-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/{rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/{rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json => rate_limit-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/{rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json => rate_limit-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/{user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4-7ea37b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2-f22b1c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3-a1f82a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5-4e2fc3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1-a460fd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/{rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/{rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json => rate_limit-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/{rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json => rate_limit-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/{user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2-f22b1c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3-a1f82a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5-4e2fc3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1-a460fd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/{rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/{rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json => rate_limit-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/{rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json => rate_limit-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/{user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2-f22b1c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3-a1f82a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5-4e2fc3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1-a460fd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/{orgs_github-api-test-org-17df55cd-86fa-40f7-93c9-069b34d0e885.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/{repos_github-api-test-org_github-api-6fede042-34ef-490c-ab77-fe2ce7d034c3.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/{repos_github-api-test-org_github-api_stats_code_frequency-09de1d80-83e2-45a8-987f-204eb7ea42a4.json => repos_github-api-test-org_github-api_stats_code_frequency-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/{user-2c19f62c-49ab-4bd3-b83d-138831bc0e49.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2-17df55.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3-6fede0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4-09de1d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1-2c19f6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/{orgs_github-api-test-org-4edea480-acf1-40ee-9636-e8842a01a9ea.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/{repos_github-api-test-org_github-api-6f33ad9d-feac-4b53-aa4a-c3b0f924a640.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/{repos_github-api-test-org_github-api_stats_commit_activity-54ebe063-0972-46bc-ba2c-12abdb28fcf0.json => repos_github-api-test-org_github-api_stats_commit_activity-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/{user-68a31e43-509d-476b-bebd-29a7129c9b2d.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2-4edea4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3-6f33ad.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4-54ebe0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1-68a31e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/{orgs_github-api-test-org-4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/{repos_github-api-test-org_github-api-6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/{repos_github-api-test-org_github-api_stats_contributors-722ef788-c190-4e69-a84a-9ad367d6630d.json => repos_github-api-test-org_github-api_stats_contributors-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/{user-8442a6db-0547-45de-9b65-259e1fe4d673.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2-4da8ec.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3-6d11bb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4-722ef7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1-8442a6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/{orgs_github-api-test-org-bc8f8b96-f45a-4539-a3e3-5f59a1c30c17.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/{repos_github-api-test-org_github-api-7631fa24-ceab-4d0f-8f22-f1041dcd792a.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/{user-a809afbf-ab4e-4117-86aa-da70544ee1bb.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2-bc8f8b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3-7631fa.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/{repos_github-api-test-org_github-api_stats_participation-4-9ae337.json => repos_github-api-test-org_github-api_stats_participation-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1-a809af.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/{orgs_github-api-test-org-754abf86-100a-406e-b1f0-8af9e395d4b8.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/{repos_github-api-test-org_github-api-b2ea09da-c234-4d3e-a636-e479e4234863.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/{repos_github-api-test-org_github-api_stats_punch_card-e401c59f-b7f3-42e9-8d49-8dae9c25b72f.json => repos_github-api-test-org_github-api_stats_punch_card-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/{user-49e5cd05-8aa2-4e37-a72e-7ffb584c1422.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2-754abf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3-b2ea09.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4-e401c5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1-49e5cd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/{repos_kamontat_checkidnumber-572d41eb-82bd-4b68-8bda-c723b1e9521e.json => repos_kamontat_checkidnumber-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/{repos_kamontat_checkidnumber_releases_latest-d2547b1f-1bc8-46a6-810c-48661d7fed2c.json => repos_kamontat_checkidnumber_releases_latest-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/{user-b9c99aa8-3e3d-435c-98e0-3af8eafc960a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2-572d41.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3-d2547b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1-b9c99a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/{repos_kamontat_java8example-7752c1cb-ba51-4716-8321-7e9a6d3fa34a.json => repos_kamontat_java8example-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/{user-53c4464c-df7f-40cd-94d2-72b47c9a4999.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2-7752c1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/{repos_kamontat_java8example_releases_latest-3-838e4d.json => repos_kamontat_java8example_releases_latest-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1-53c446.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/{orgs_github-api-test-org-cb173af2-c793-444a-acdf-c3850e7afdbe.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/{repos_github-api-test-org_github-api-0a4d7a1a-f99c-47ca-840a-3e920c18bd1f.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/{repos_github-api-test-org_github-api-1c529d7c-99f0-43ae-8231-044f48beac1a.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/{repos_github-api-test-org_github-api-2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/{user-7f6e9a01-5bfa-4f72-9947-07df902f56c3.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2-cb173a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3-0a4d7a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4-2c69d5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5-1c529d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1-7f6e9a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/{repos_github-api-test-org_temp-checkstargazerscount-bd22f750-1a7c-4274-b5d6-9e2164a1eb2a.json => repos_github-api-test-org_temp-checkstargazerscount-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/{user-ebb96197-f82b-4a05-87e8-932107fd594e.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2-bd22f7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1-ebb961.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/{repos_github-api-test-org_temp-checkwatcherscount-480b7f68-9bb9-4443-b01f-d617b71fd015.json => repos_github-api-test-org_temp-checkwatcherscount-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/{user-0f326a28-7b63-4439-b05b-645236cafd19.json => user-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1-05a87d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2-480b7f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3-0f326a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/{orgs_github-api-test-org-cadf65cc-4434-4d3a-b4cf-4b1b79272f46.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/{repos_github-api-test-org_github-api-228f0322-215d-487e-9132-17bc4c3bf020.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/{user-87afc711-0c63-4cc6-96b5-26eb391105de.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2-cadf65.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3-228f03.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/{repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json => repos_github-api-test-org_github-api_branches_test_nonexistent-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1-87afc7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/{orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/{repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/{repos_github-api-test-org_github-api_branches_test_urlencode-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json => repos_github-api-test-org_github-api_branches_test_urlencode-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/{user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2-5e8ae8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3-30364e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1-c92cdb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{orgs_github-api-5d8b3f90-4fb5-4321-b979-b06127d19224.json => orgs_github-api-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{repos_github-api_github-api-71c75ce1-402c-4835-8841-f1707d28d88d.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6f217f80-e2fa-4a54-b6ab-b110055d776a.json => repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f.json => repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-797b1c78-fa26-490b-84c8-bd33b21dc7f7.json => repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-1787eed0-2420-4fc6-84b7-7a36b96580b5.json => repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/{repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-2c64ebec-78aa-4073-86be-689da8b5914a.json => repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1-5d8b3f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2-71c75c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3-6f217f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4-f57cb1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5-797b1c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6-1787ee.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7-2c64eb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/{orgs_github-api-test-org-d319a11c-9dce-4642-a18a-175f6cdbde6d.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/{repos_github-api-test-org_github-api-4c1e8c73-a989-4625-8582-5fa6a2f88f4d.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/{repos_github-api-test-org_github-api_collaborators-2b8badfb-52b8-4304-a9a5-66b80274e93d.json => repos_github-api-test-org_github-api_collaborators-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/{user-1fc40d28-9354-4587-884e-cf24228c088a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2-d319a1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3-4c1e8c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-2b8bad.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1-1fc40d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/{orgs_github-api-test-org-94de530c-025f-4dae-b829-8a7b7ea73c4b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/{repos_github-api-test-org_github-api-99deb429-da7c-4f6c-9d82-b7e637586210.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/{user-98b2b906-bc8f-4f1c-9077-87f686c19718.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-94de53.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-99deb4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1-98b2b9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/{orgs_github-api-test-org-793c4cc7-7741-4f8e-b96f-bb0626ce2d51.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/{repos_github-api-test-org_github-api-6352b5c2-d793-4c94-ac5f-9607d6b665f4.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/{user-d332ba59-878f-47c2-b875-0bb64784cf03.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2-793c4c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3-6352b5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4-a9d176.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1-d332ba.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/{repos_github-api-test-org_temp-getmergeoptions-cb893c1a-1c74-4838-b473-342f8c2b8262.json => repos_github-api-test-org_temp-getmergeoptions-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/{user-5d8fe237-9241-4331-8808-0ca2781e48be.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2-cb893c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1-5d8fe2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/{orgs_apache-f737f022-de94-4025-89aa-a912b960c50c.json => orgs_apache-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/{repos_apache_groovy-cc8d8558-cd64-41fb-bdc6-37ff181eb321.json => repos_apache_groovy-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/{repos_github-api-test-org_test-permission-4976af4f-68c3-4057-a201-3d498f842bd5.json => repos_github-api-test-org_test-permission-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/{repos_github-api-test-org_test-permission_collaborators_dude_permission-665c4060-0f62-4490-b41c-88943cc0e008.json => repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/{repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-8dd9fa47-74b9-42b8-b50e-cb0f13a842fb.json => repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/{user-01e35abe-08e1-4af9-b88b-3a9f87603970.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5-f737f0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6-cc8d85.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/{repos_apache_groovy_collaborators_jglick_permission-7-61ff8c.json => repos_apache_groovy_collaborators_jglick_permission-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2-4976af.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4-665c40.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3-8dd9fa.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1-01e35a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/{orgs_github-api-test-org-4d7df9f1-02f4-4e5b-af93-17eb8719f528.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/{repos_github-api-test-org_github-api-14b99bef-f40b-440a-9e65-c84a53678a8e.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/{user-bd5a7a15-f398-4c3e-a221-0825bbb912fc.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2-4d7df9.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3-14b99b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/{repos_github-api-test-org_github-api_hooks-4-2b78cc.json => repos_github-api-test-org_github-api_hooks-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1-bd5a7a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/{repos_github-api-test-org_temp-getrefs-b801c47d-7365-44a2-84d8-2f6e04bad661.json => repos_github-api-test-org_temp-getrefs-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/{repos_github-api-test-org_temp-getrefs_git_refs-75f99e25-50ad-4fb0-b82e-91d41c57db5e.json => repos_github-api-test-org_temp-getrefs_git_refs-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/{user-5f3cda62-83b0-44c6-8ddb-03e4bf6ada41.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2-b801c4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3-75f99e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1-5f3cda.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/{repos_github-api-test-org_temp-getrefsemptytags-9293d03b-4a5e-43ea-9df2-c419ac3ff3b4.json => repos_github-api-test-org_temp-getrefsemptytags-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/{user-71dacb02-1a7c-4d9a-98bd-30c0891bed64.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2-9293d0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/{repos_github-api-test-org_temp-getrefsemptytags_git_refs_tags-3-60a3ef.json => repos_github-api-test-org_temp-getrefsemptytags_git_refs_tags-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1-71dacb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/{repos_github-api-test-org_temp-getrefsheads-7b70f17b-8996-4f3c-b51e-4e185e988ee0.json => repos_github-api-test-org_temp-getrefsheads-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/{repos_github-api-test-org_temp-getrefsheads_git_refs_heads-95cf2b75-6df1-42ca-93dc-068a4690233c.json => repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/{user-4d2e3f3e-c3c0-44e6-8000-a0e52f469579.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2-7b70f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3-95cf2b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1-4d2e3f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/{orgs_github-api-test-org-f2bd68e9-de30-4416-a2ed-8674710a5ff7.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/{repos_github-api-test-org_github-api-c19ba509-63bb-424a-83d7-c308b7d42c35.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/{user-c36cc5db-11f3-4ba4-a6c0-d7b45353121f.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2-f2bd68.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3-c19ba5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/{repos_github-api-test-org_github-api_releases_tags_foo-bar-baz-4-3ac213.json => repos_github-api-test-org_github-api_releases_tags_foo-bar-baz-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1-c36cc5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/{orgs_github-8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c.json => orgs_github-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/{repos_github_hub-fc521132-c82c-4c40-a60a-a60b17884999.json => repos_github_hub-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/{repos_github_hub_releases_tags_v230-pre10-dcb217dc-3403-4785-b4cc-72b425ff89bc.json => repos_github_hub_releases_tags_v230-pre10-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/{user-87c44ef0-9caf-4dcb-b261-9ddd517c941a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2-8cbc3a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3-fc5211.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4-dcb217.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1-87c44e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/{orgs_github-18ee08b2-d3da-40f9-81b1-a4976502dc61.json => orgs_github-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/{repos_github_hub-e0a029ec-a3a9-4f0c-904f-de386dcfbfde.json => repos_github_hub-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/{user-f64c26dc-b35e-4fef-ba8e-6747d1e1f89b.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2-18ee08.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3-e0a029.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/{repos_github_hub_releases_9223372036854775807-4-b82be5.json => repos_github_hub_releases_9223372036854775807-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1-f64c26.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/{orgs_github-f8d704eb-efb2-4a44-a403-144947461c8a.json => orgs_github-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/{repos_github_hub-f5ba6b71-c860-406a-80ad-135d8e9e18c3.json => repos_github_hub-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/{repos_github_hub_releases_6839710-2959bf19-ebbd-4b5f-9f83-07b70965577f.json => repos_github_hub_releases_6839710-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/{user-37773edf-8a04-4682-98f0-dd715240d160.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2-f8d704.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3-f5ba6b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4-2959bf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1-37773e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/{orgs_github-api-test-org-5ebb4358-3c06-491c-9814-8bdb0ec9e00b.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/{repos_github-api-test-org_github-api-65381ed0-8f62-4720-a188-44933eee0fdf.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/{repos_github-api-test-org_github-api_collaborators-b0680d17-cd3b-4ec0-a857-d352c7167e94.json => repos_github-api-test-org_github-api_collaborators-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/{user-b9ef1fbf-cf24-4083-9fb0-94e698629c4e.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2-5ebb43.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3-65381e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-b0680d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1-b9ef1f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/{orgs_github-api-7c4b2a82-e18f-45a2-a6b5-4baaea191b89.json => orgs_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/{repos_github-api_github-api-d87d9579-8da1-4f01-a6e6-6f91e04cc8a7.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/{repos_github-api_github-api_contributors-cd622100-1a8e-4b33-9716-dbaf0b55c2aa.json => repos_github-api_github-api_contributors-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/{user-5705a11e-1421-4985-8e1f-b1e25b4ef547.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2-7c4b2a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3-d87d95.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4-cd6221.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1-5705a1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/{repos_github-api-test-org_empty-af73e21a-68d3-4683-a1e1-3415319211e4.json => repos_github-api-test-org_empty-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/{user-8d2ebbe4-ff50-4d3e-9932-d48541155f86.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2-af73e2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/{repos_github-api-test-org_empty_contributors-3-dae0e3.json => repos_github-api-test-org_empty_contributors-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1-8d2ebb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/{repos_github-api_github-api-1852eb94-7578-45d0-8b90-fa23b623dccf.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/{user-aab4cb17-6715-454d-8498-f30d5e2ca5a2.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2-1852eb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/{repos_github-api_github-api_languages-3-acab46.json => repos_github-api_github-api_languages-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1-aab4cb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/{repos_github-api-test-org_temp-listrefs-368c90b4-cb7c-45c8-aca0-2c5c02456d2a.json => repos_github-api-test-org_temp-listrefs-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/{repos_github-api-test-org_temp-listrefs_git_refs-efdb254c-0993-4b3e-8094-b67bb6261b43.json => repos_github-api-test-org_temp-listrefs_git_refs-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/{user-b4ac1b5e-eecc-4844-b014-67e67c77fb7a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2-368c90.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3-efdb25.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1-b4ac1b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/{repos_github-api-test-org_temp-listrefsemptytags-fd0b4371-0538-48a0-b577-af5e61538e1c.json => repos_github-api-test-org_temp-listrefsemptytags-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/{user-ddaa07ce-0561-498e-b1a4-7738966139d1.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2-fd0b43.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/{repos_github-api-test-org_temp-listrefsemptytags_git_refs_tags-3-a80c1b.json => repos_github-api-test-org_temp-listrefsemptytags_git_refs_tags-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1-ddaa07.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/{repos_github-api-test-org_temp-listrefsheads-41a76215-5c4e-4604-8785-f3ef59b68ade.json => repos_github-api-test-org_temp-listrefsheads-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/{repos_github-api-test-org_temp-listrefsheads_git_refs_heads-1f4fd84a-23db-43f3-bf4b-afa585364f08.json => repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/{user-8da6cb32-8bd1-4e7b-b4d7-de0426c59757.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2-41a762.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3-1f4fd8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1-8da6cb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/{orgs_github-c4db4df5-1d50-46c5-b667-0a3b1d9653e6.json => orgs_github-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/{repos_github_hub-8338609c-0f4c-4fe5-9ca6-fc64b08673be.json => repos_github_hub-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/{repos_github_hub_releases-5c5da4ad-d9da-4ce8-8076-8797eb1070a9.json => repos_github_hub_releases-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/{user-95be222c-381f-4c01-bac9-fedbc8963616.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2-c4db4d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3-833860.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4-5c5da4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1-95be22.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/{orgs_github-api-test-org-02e4a8c7-56fe-4815-8d80-feabf5712da3.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/{repos_github-api-test-org_github-api-490a149b-ef4a-4edf-8417-725e174b0328.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/{repos_github-api-test-org_github-api_tags-76fbf62d-6d52-42f5-baa5-e4118a9a5b79.json => repos_github-api-test-org_github-api_tags-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/{repositories_206888201_tags-477fba2c-a17d-4e6b-b253-47936b2a0015.json => repositories_206888201_tags-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/{repositories_206888201_tags-4c548e0c-f054-42c0-b6d7-e4322d352ccb.json => repositories_206888201_tags-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/{user-1be69923-8441-4b3e-8665-9766d40b5f75.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2-02e4a8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3-490a14.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4-76fbf6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5-477fba.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6-4c548e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1-1be699.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/{repos_github-api-test-org_temp-listtagsempty-13b3212b-3197-40b2-ab98-9bbb3ea9a8af.json => repos_github-api-test-org_temp-listtagsempty-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/{user-f450f169-1fb3-4d19-8716-8568f1bef559.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2-13b321.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/{repos_github-api-test-org_temp-listtagsempty_tags-3-ce4b89.json => repos_github-api-test-org_temp-listtagsempty_tags-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1-f450f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/{markdown-82013a58-1976-472e-9bc9-2535b965c1ff.txt => markdown-4.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/{repos_github-api_github-api-b97d0b95-42e5-462c-866b-f3dc51258730.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/{user-d7cf6a1a-c0db-411d-b646-0a128e9b2aff.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4-82013a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/{markdown_raw-2-44dcd2.json => markdown_raw-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3-b97d0b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1-d7cf6a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/{search_repositories-03ff4bb7-7909-4e5b-9322-f8f3923fa65a.json => search_repositories-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/{user-3b3417e7-67e7-4612-a015-f97b98848847.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2-03ff4b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1-3b3417.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{orgs_github-api-test-org-3774735f-e809-4bd5-8c55-9243e2588747.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{repos_github-api-test-org_github-api-93f4b207-0e0b-4b0a-a88e-2088b826a570.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{repos_github-api-test-org_github-api-850c61e4-3c20-4101-a754-cc801b26f76e.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{repos_github-api-test-org_github-api-c79f68ee-7ead-4b33-9903-bea9f47ef5b6.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{repos_github-api-test-org_github-api-0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{repos_github-api-test-org_github-api-ff9f6ee5-57c2-4ca0-9296-69d5280e9172.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/{user-1520ef6e-b895-49bb-955e-0a0678e36010.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-377473.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-ff9f6e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4-850c61.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5-c79f68.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6-0e5ceb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7-93f4b2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1-1520ef.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-3c8120ed-2ea0-4228-8639-7159cc73d23b.json => repos_github-api-test-org_temp-setmergeoptions-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-0d8d7ebb-f978-4af9-b545-4b301a52d7c7.json => repos_github-api-test-org_temp-setmergeoptions-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-3e3a54cc-fd38-4fd5-b5d1-d998d45be38c.json => repos_github-api-test-org_temp-setmergeoptions-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-200ab5e0-f5fd-4d4c-937f-b3798acb31cf.json => repos_github-api-test-org_temp-setmergeoptions-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-036019d5-fdf5-4936-b85a-3e2d6c8585f3.json => repos_github-api-test-org_temp-setmergeoptions-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-4de721aa-c26b-4df7-a87e-67b440454149.json => repos_github-api-test-org_temp-setmergeoptions-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-265263e7-6c87-4d23-b83f-12e2c6fceba4.json => repos_github-api-test-org_temp-setmergeoptions-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-d82ad1a3-76bb-4f88-8b6a-097195313516.json => repos_github-api-test-org_temp-setmergeoptions-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{repos_github-api-test-org_temp-setmergeoptions-6224e039-5be4-4fd9-8a6d-8756a393c94d.json => repos_github-api-test-org_temp-setmergeoptions-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/{user-b42d2004-5fb5-415d-96ff-d9c628b799f3.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10-3c8120.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2-0d8d7e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3-3e3a54.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4-200ab5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5-036019.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6-4de721.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7-265263.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8-d82ad1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9-6224e0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1-b42d20.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/{orgs_github-api-test-org-564bceaa-c92a-442f-af3e-4659fa38b3e0.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/{repos_github-api-test-org_github-api-5861f3bb-636a-4c2d-8748-b7d7f95f26a0.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/{user-77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2-564bce.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3-5861f3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/{repos_github-api-test-org_github-api_subscription-4-d888ea.json => repos_github-api-test-org_github-api_subscription-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/{repos_github-api-test-org_github-api_subscription-5-b8ab91.json => repos_github-api-test-org_github-api_subscription-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/{repos_github-api-test-org_github-api_subscription-6-7de879.json => repos_github-api-test-org_github-api_subscription-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/{repos_github-api-test-org_github-api_subscription-7-50d81d.json => repos_github-api-test-org_github-api_subscription-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1-77d1bd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api-159ce759-42c4-4141-a31f-c66a04e7d46c.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents-07f37d0d-06c1-4077-b3de-ca6be4206dc6.json => repos_github-api_github-api_contents-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_cname-7ccd6fc3-6a14-4d0c-9493-25c060f5a826.json => repos_github-api_github-api_contents_cname-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_dependencieshtml-e65843d5-ae12-4571-bc20-10b2a749c4c4.json => repos_github-api_github-api_contents_dependencieshtml-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_dependency-convergencehtml-2711f47a-83b4-4141-93d3-a0a5ed1b4f66.json => repos_github-api_github-api_contents_dependency-convergencehtml-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_dependency-infohtml-b8795612-0b73-44e5-8ce9-99633f2657ea.json => repos_github-api_github-api_contents_dependency-infohtml-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_distribution-managementhtml-8aba06cb-6fe6-4236-9cba-64c33018cdb7.json => repos_github-api_github-api_contents_distribution-managementhtml-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_indexhtml-699687aa-17e3-479a-a70b-26fd50ecd6ae.json => repos_github-api_github-api_contents_indexhtml-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_integrationhtml-f6bbfab2-699a-4434-804c-70f76610836e.json => repos_github-api_github-api_contents_integrationhtml-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_issue-trackinghtml-5be48b92-90ac-421d-bb90-81a7bd16bf4d.json => repos_github-api_github-api_contents_issue-trackinghtml-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_licensehtml-e6c4a515-269e-4098-a739-4d04302abca9.json => repos_github-api_github-api_contents_licensehtml-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_mail-listshtml-9fa1b590-dcd7-421a-97fc-5c46754c2c80.json => repos_github-api_github-api_contents_mail-listshtml-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_plugin-managementhtml-933e0254-7548-4d8b-a94f-e0dcef8afaf9.json => repos_github-api_github-api_contents_plugin-managementhtml-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_pluginshtml-ee7e46e7-9b8f-4df4-aacd-92228c8d284f.json => repos_github-api_github-api_contents_pluginshtml-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_project-infohtml-eed0ad79-661a-4b20-a4a1-1bcd44d8af3d.json => repos_github-api_github-api_contents_project-infohtml-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_project-reportshtml-64d11c32-506a-4275-a050-4d268256bf6c.json => repos_github-api_github-api_contents_project-reportshtml-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_project-summaryhtml-c278dd7b-34e7-452e-83ae-d390638bbe38.json => repos_github-api_github-api_contents_project-summaryhtml-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_source-repositoryhtml-dfae6054-83b7-4095-99dc-f497ef58044a.json => repos_github-api_github-api_contents_source-repositoryhtml-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{repos_github-api_github-api_contents_team-listhtml-69298281-9045-4dd4-8934-ac0a43157ef7.json => repos_github-api_github-api_contents_team-listhtml-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/{user-656249de-1113-417e-8ea0-ce0930482f4a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2-159ce7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3-07f37d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4-7ccd6f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5-e65843.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6-2711f4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7-b87956.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8-8aba06.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9-699687.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10-f6bbfa.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11-5be48b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12-e6c4a5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13-9fa1b5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14-933e02.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15-ee7e46.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16-eed0ad.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17-64d11c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18-c278dd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19-dfae60.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20-692982.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1-656249.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_dependencieshtml-d0c5eb23-a516-43ab-9a51-230d66d21e90.txt => github-api_github-api_gh-pages_dependencieshtml-2.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_dependency-convergencehtml-9eeed313-39aa-4d0e-b7c9-e26acab9698f.txt => github-api_github-api_gh-pages_dependency-convergencehtml-3.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_dependency-infohtml-3ca71855-6e2d-44d8-9cf9-47cbb2572252.txt => github-api_github-api_gh-pages_dependency-infohtml-4.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_distribution-managementhtml-445a75a1-4463-4003-965e-2d1ffbbd4d60.txt => github-api_github-api_gh-pages_distribution-managementhtml-5.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_indexhtml-46228325-12ac-442f-86ee-e5e211cf79cb.txt => github-api_github-api_gh-pages_indexhtml-6.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_integrationhtml-92a89976-9e4e-46bb-aa19-b32445a2ed9e.txt => github-api_github-api_gh-pages_integrationhtml-7.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_issue-trackinghtml-77d917fb-69d9-466a-99f6-3bfbf92998fd.txt => github-api_github-api_gh-pages_issue-trackinghtml-8.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_licensehtml-833a6540-79e4-4464-88e3-f87a5858230e.txt => github-api_github-api_gh-pages_licensehtml-9.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_mail-listshtml-497d362b-54ca-4c9d-ac96-78f14da94df6.txt => github-api_github-api_gh-pages_mail-listshtml-10.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_plugin-managementhtml-ee14513c-3bfb-4d8a-93f5-a9d188d7aa01.txt => github-api_github-api_gh-pages_plugin-managementhtml-11.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_pluginshtml-80c8a143-a83b-45c8-881e-595f14aa1546.txt => github-api_github-api_gh-pages_pluginshtml-12.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_project-infohtml-c17c46c7-df79-4adf-b165-b8c801c896b6.txt => github-api_github-api_gh-pages_project-infohtml-13.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_project-reportshtml-5367f0f5-0668-4a94-97d8-d6774aa02bdb.txt => github-api_github-api_gh-pages_project-reportshtml-14.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_project-summaryhtml-60482688-7e2b-4475-ac2a-4f4c3ade718a.txt => github-api_github-api_gh-pages_project-summaryhtml-15.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_source-repositoryhtml-1548ed66-30fe-4ee5-8fba-e7de0b95df05.txt => github-api_github-api_gh-pages_source-repositoryhtml-16.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/{github-api_github-api_gh-pages_team-listhtml-15e8417b-48a3-4a71-b239-51b987d7b006.txt => github-api_github-api_gh-pages_team-listhtml-17.txt} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/{github-api_github-api_gh-pages_cname-1-b36b55.json => github-api_github-api_gh-pages_cname-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2-d0c5eb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3-9eeed3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4-3ca718.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5-445a75.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6-462283.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7-92a899.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8-77d917.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9-833a65.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10-497d36.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11-ee1451.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12-80c8a1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13-c17c46.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14-5367f0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15-604826.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16-1548ed.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17-15e841.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/{repos_bitwiseman_test-repo-public-1c10db5e-a753-4136-813b-1a69b5bccc8e.json => repos_bitwiseman_test-repo-public-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/{repos_bitwiseman_test-repo-public-a50794a3-d76a-4627-bbe3-f4ed30375298.json => repos_bitwiseman_test-repo-public-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/{repos_bitwiseman_test-repo-public-5f1779e8-fd79-4b15-af0c-db5a92b11aa3.json => repos_bitwiseman_test-repo-public-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/{repos_bitwiseman_test-repo-public-7452138f-8195-48d1-92e3-ebb73d152750.json => repos_bitwiseman_test-repo-public-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/{user-e09de733-d3c9-4a4d-89ab-8180ace9484c.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/{user_repos-d25ff0c0-0d91-461c-a42d-74926a2b751e.json => user_repos-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3-1c10db.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4-a50794.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5-745213.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6-5f1779.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/{repos_bitwiseman_test-repo-public-7-f9f729.json => repos_bitwiseman_test-repo-public-7.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1-e09de7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2-d25ff0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/{orgs_github-api-test-org-0774979f-2840-46c6-ac31-ea9ebea16a15.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/{repos_github-api-test-org_github-api-6396d3b5-36ad-4990-a691-55a3bca11280.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/{user-489e213c-810a-407d-b9aa-f7b00cdc8995.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2-077497.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3-6396d3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3.json
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-10-d74974.json => repos_github-api-test-org_github-api_topics-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-11-57a970.json => repos_github-api-test-org_github-api_topics-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-4-e6442e.json => repos_github-api-test-org_github-api_topics-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-5-2dc36e.json => repos_github-api-test-org_github-api_topics-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-6-83a58f.json => repos_github-api-test-org_github-api_topics-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-7-eed846.json => repos_github-api-test-org_github-api_topics-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-8-df3c07.json => repos_github-api-test-org_github-api_topics-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/{repos_github-api-test-org_github-api_topics-9-6159ab.json => repos_github-api-test-org_github-api_topics-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1-489e21.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/{orgs_github-api-test-org-d542cf64-ac9f-4fe7-bc38-9286b63c7828.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/{repos_github-api-test-org_github-api-18a0b001-eca8-40df-bafa-9c767c9e209a.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/{repos_github-api-test-org_github-api_git_refs-f654b3ef-74dc-4775-8809-f07c2a44925e.json => repos_github-api-test-org_github-api_git_refs-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/{repos_github-api-test-org_github-api_git_tags-4af1f264-7a36-4de9-bda9-a3ded9171589.json => repos_github-api-test-org_github-api_git_tags-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/{user-a8d3e54a-c069-4f34-9f86-e811649e0ce1.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2-d542cf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3-18a0b0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5-f654b3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4-4af1f2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1-a8d3e5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{orgs_github-api-test-org-3211dfd0-5228-4cdc-aea3-ab67437f3fd4.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{orgs_github-api-test-org_teams_dummy-team-b239719e-8610-449b-91bd-a35f4cc00424.json => orgs_github-api-test-org_teams_dummy-team-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{orgs_github-api-test-org_teams_dummy-team-32efe61a-4308-46c2-a349-010050ec8685.json => orgs_github-api-test-org_teams_dummy-team-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{orgs_github-api-test-org_teams_dummy-team-32b16e2a-e453-4e91-9442-08073572a327.json => orgs_github-api-test-org_teams_dummy-team-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{teams_3451996-a8678668-24d0-4f75-b5a3-da720a764dd6.json => teams_3451996-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{teams_3451996-de9b6c26-1f63-4cc3-b4f6-6691f9bf180c.json => teams_3451996-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/{user-fd7e486f-6713-462f-955f-7fcb8535064e.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2-3211df.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3-b23971.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5-32efe6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7-32b16e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4-a86786.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6-de9b6c.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1-fd7e48.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{orgs_github-api-test-org-daa5182f-9078-4e4d-ab7e-3b9c54383a8c.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{orgs_github-api-test-org_teams_dummy-team-2b66312b-5707-492e-81cd-55b9f49b65f1.json => orgs_github-api-test-org_teams_dummy-team-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{orgs_github-api-test-org_teams_dummy-team-47d338fd-8730-4953-94f1-2261a3d6e6a3.json => orgs_github-api-test-org_teams_dummy-team-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{orgs_github-api-test-org_teams_dummy-team-a73705e3-9d60-41e7-be95-b417ea3eb75d.json => orgs_github-api-test-org_teams_dummy-team-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{teams_3451996-70263be8-4b8a-4f60-9e0a-da31aae7519f.json => teams_3451996-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{teams_3451996-51846d5d-d6ae-4a92-b608-ecaa62c3b73b.json => teams_3451996-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/{user-ba4c373b-e7b2-498a-adc1-e63cacdd50cb.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2-daa518.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3-2b6631.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5-47d338.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7-a73705.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4-70263b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6-51846d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1-ba4c37.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest-60eb069c-48ea-42a2-872d-2614c39e8a54.json => repos_github-api-test-org_ghtreebuildertest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-05a6551a-8b5b-46c9-8429-89f8cc7b567d.json => repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-b093dc53-dcdf-49dc-a181-d6b85e7c238c.json => repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-bbedc2ef-9cff-41f6-89c1-ae6b06906f9e.json => repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-5f081830-6fd0-42fa-a754-aee9a8ec37f8.json => repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_git_commits-aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8.json => repos_github-api-test-org_ghtreebuildertest_git_commits-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-e0c20fc7-e5c2-4af3-875a-3489d677a32f.json => repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-add23dfd-74f9-452c-8986-0a80d2f6cbec.json => repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_git_trees-51f469be-c974-4dcb-8272-9cb5b38d82b0.json => repos_github-api-test-org_ghtreebuildertest_git_trees-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{repos_github-api-test-org_ghtreebuildertest_git_trees_master-c5654fe0-f432-4d1f-bda5-8b9c6931b692.json => repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/{user-f77e845b-f07b-4149-8538-0facc0ebfcb2.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2-60eb06.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12-05a655.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14-b093dc.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15-bbedc2.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13-5f0818.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/{repos_github-api-test-org_ghtreebuildertest_git_blobs-5-8e41ee.json => repos_github-api-test-org_ghtreebuildertest_git_blobs-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/{repos_github-api-test-org_ghtreebuildertest_git_blobs-6-9c928c.json => repos_github-api-test-org_ghtreebuildertest_git_blobs-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/{repos_github-api-test-org_ghtreebuildertest_git_blobs-7-5f2849.json => repos_github-api-test-org_ghtreebuildertest_git_blobs-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/{repos_github-api-test-org_ghtreebuildertest_git_blobs-8-37a191.json => repos_github-api-test-org_ghtreebuildertest_git_blobs-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10-aa6ff1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11-e0c20f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-add23d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9-51f469.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-c5654f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1-f77e84.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest-f665d43c-dc68-49aa-8402-6e105989abea.json => repos_github-api-test-org_ghtreebuildertest-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-33349f33-4070-4061-b392-c7f61d38b7ec.json => repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-d4f75274-523b-497b-bfc0-80f9ec9f3e62.json => repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_git_commits-31ea7502-2364-4867-bd76-d6fa050b6256.json => repos_github-api-test-org_ghtreebuildertest_git_commits-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-683572f1-512c-4a6f-b766-7447ed7908fe.json => repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-85167f57-6ea5-4b27-8130-a71e81fdc4f3.json => repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_git_trees-2c2c7033-1c85-455f-b7b8-0b1b82add074.json => repos_github-api-test-org_ghtreebuildertest_git_trees-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{repos_github-api-test-org_ghtreebuildertest_git_trees_master-2193534b-ce04-4633-95ae-aa382de15657.json => repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/{user-ef48e63e-7fa6-4ece-ae75-623cb2b525b4.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2-f665d4.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10-33349f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11-d4f752.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/{repos_github-api-test-org_ghtreebuildertest_git_blobs-5-a844c6.json => repos_github-api-test-org_ghtreebuildertest_git_blobs-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/{repos_github-api-test-org_ghtreebuildertest_git_blobs-6-95bf11.json => repos_github-api-test-org_ghtreebuildertest_git_blobs-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8-31ea75.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-683572.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9-85167f.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7-2c2c70.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-219353.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1-ef48e6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/{user-9c77ca90-ac6b-4375-8c32-7669b7dec98d.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/{user_repos-1c6314f8-ce12-4181-8ba9-d7389c1774e9.json => user_repos-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/{users_kohsuke-f2bb88fe-c538-45f8-88cb-7a3acaca2544.json => users_kohsuke-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/{repos_kohsuke_github-user-test-private-repo-4-666cac.json => repos_kohsuke_github-user-test-private-repo-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1-9c77ca.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2-1c6314.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3-f2bb88.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3.json
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/{users_rtyler-11f4235a-9149-4727-bb9b-91b6dce384b5.json => users_rtyler-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/{users_rtyler_keys-395dc00a-5234-4866-815c-d7b49cdd0157.json => users_rtyler_keys-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1-11f423.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2-395dc0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2.json
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/{user-ca1c867f-b2ed-4064-80c5-8cfd1c50290f.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/{users_rtyler-b56699fa-976a-4309-abc2-cece79cb70d7.json => users_rtyler-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/{users_rtyler_followers-5d12f119-f036-4a78-a192-3af769a82f87.json => users_rtyler_followers-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/{users_rtyler_following-51f79259-5780-473e-b593-e2a010f0b430.json => users_rtyler_following-4.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1-ca1c86.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2-b56699.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3-5d12f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4-51f792.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4.json
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/{user-90560989-d163-4e6c-8b13-c3133fc2b1fd.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/{user_50003_repos-1eeb7b56-56af-4143-9921-1169995e7e3c.json => user_50003_repos-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/{user_50003_repos-d1c08a5b-3d03-404b-a293-56fb14f59a39.json => user_50003_repos-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/{user_50003_repos-1e91f19a-22d2-4035-97b1-d5ef5e3664ba.json => user_50003_repos-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/{users_kohsuke-da994e50-330e-46e8-97ee-f4da86418bca.json => users_kohsuke-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/{users_kohsuke_repos-9f7b75e8-6027-4a8d-adc7-2a75326dcd86.json => users_kohsuke_repos-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1-905609.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4-1eeb7b.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5-d1c08a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6-1e91f1.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2-da994e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3-9f7b75.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3.json
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/{user-e8077934-1fa6-4421-9f2a-a4b7bde4c1a8.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/{user_50003_repos-c1c1b703-78f4-4000-9759-cab99596d17b.json => user_50003_repos-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/{users_kohsuke-f1828d0f-f817-49cf-9922-4d64c283688e.json => users_kohsuke-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/{users_kohsuke_repos-24db0a2f-2ce8-469e-9bb6-232c10fb4fd7.json => users_kohsuke_repos-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1-e80779.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4-c1c1b7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2-f1828d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3-24db0a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/{repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/{repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-d76abea9-c1be-430a-bbd0-28931c58e1e8.json => repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/{user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2-441cdf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3-d76abe.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1-c247f8.json
 create mode 100644 src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/__files/{-2ce6df61-378a-43bd-9d37-d0851f8699bf.json => -1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1-2ce6df.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/__files/{meta-d7546658-0019-4aac-ad1a-502d7abd8050.json => meta-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1-d75466.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{organizations-0fccda9a-fb5c-4db2-9990-09b3cb4f74bd.json => organizations-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{organizations-003debd0-3deb-41e2-a5ad-b1bdb02b270a.json => organizations-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{organizations-025896c9-23c5-4051-b363-eb2e59c0c90a.json => organizations-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{organizations-4ef81065-9209-4a61-80c4-9f4dd64508ac.json => organizations-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{organizations-19d13a8c-7b2a-4dbb-a0fb-e69ecb693956.json => organizations-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_collectiveidea-4bbf97a8-2c8d-4c25-a7e4-208719659507.json => orgs_collectiveidea-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_engineyard-643eb559-d752-4906-861b-4cfe1723286f.json => orgs_engineyard-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_entryway-e1bd91f3-b63b-4fed-bb85-3da264635250.json => orgs_entryway-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_errfree-63eb86fa-54a5-4115-bdda-1804f5db66af.json => orgs_errfree-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_merb-df20cca6-38fd-45f8-9784-0aaec71bbb8a.json => orgs_merb-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_ministrycentered-40a544eb-0080-4cff-b543-7acf299f4068.json => orgs_ministrycentered-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_moneyspyder-859aaf3c-8049-4341-9984-6360921b5bb3.json => orgs_moneyspyder-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_ogc-7ba44dcd-146a-427c-b2cb-ff6291d00223.json => orgs_ogc-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_sevenwire-2a01f699-874a-4526-877d-e15644e401c7.json => orgs_sevenwire-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{orgs_sproutit-a165deae-7ede-4c89-aab5-5d36e5b0513a.json => orgs_sproutit-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/{user-d7829e63-d5dc-4d25-846d-7d1e2dd2500e.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11-0fccda.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14-003deb.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2-025896.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5-4ef810.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8-19d13a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7-4bbf97.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4-643eb5.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12-e1bd91.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3-63eb86.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13-df20cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6-40a544.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15-859aaf.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9-7ba44d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10-2a01f6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16-a165de.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1-d7829e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{user-83656aeb-e643-451b-a0ee-d8fe7f04e8a1.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users-c2940d51-9e34-42a7-9eff-c74efd7221c0.json => users-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_brynary-87de93ce-da70-4b2b-9fd2-160cb43f69f8.json => users_brynary-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_defunkt-14f04ed7-4d31-44de-968d-43d1b92eeb42.json => users_defunkt-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_evanphx-bb2fea35-b754-47f3-8cc4-eb3a2565fc89.json => users_evanphx-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_ezmobius-2e9ea716-43e7-4062-8359-e8d8946b08e1.json => users_ezmobius-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_ivey-2220ec20-6a77-4317-8784-b9dbaea2d27b.json => users_ivey-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_mojombo-41ed065f-76ae-483d-acd2-363d73c6fc1d.json => users_mojombo-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_pjhyett-41b46164-ab52-4908-b424-bcfdf1031af2.json => users_pjhyett-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_vanpelt-900a0e1a-6b3a-4b29-9f14-d997f1139396.json => users_vanpelt-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_wayneeseguin-3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4.json => users_wayneeseguin-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/{users_wycats-b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a.json => users_wycats-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1-83656a.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2-c2940d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12-87de93.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4-14f04e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9-bb2fea.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7-2e9ea7.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8-2220ec.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3-41ed06.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5-41b461.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10-900a0e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11-3e6233.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6-b5f8d0.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/{repositories_167174_contents_src_attributes_classesjs-d7ab2e43-a548-4208-a44b-5d15b0c3b195.json => repositories_167174_contents_src_attributes_classesjs-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/{search_code-8ebadd89-ed2a-49f2-9dbd-490cadc9923a.json => search_code-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/{user-d3b1f32c-0a98-4c3d-a630-00f934483deb.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3-d7ab2e.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2-8ebadd.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1-d3b1f3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/{search_users-0ca09437-a0ff-43ac-8953-215b38b51121.json => search_users-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/{user-76f6274b-3142-44e3-a93a-9584aa8bfe0d.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/{users_mojombo-6e29c619-1712-420d-b911-4f937c2a5cb1.json => users_mojombo-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2-0ca094.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1-76f627.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3-6e29c6.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/{repositories-7bda3de6-8df5-4296-b787-0453ab408e59.json => repositories-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/{repositories-85ebe399-5214-499f-92fd-055f864faad2.json => repositories-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/{user-9eed5705-4dda-41d0-86a0-7cf31d34af75.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2-7bda3d.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3-85ebe3.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1-9eed57.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/__files/{authorizations-4b8125f6-3ec7-4326-9682-19b9e0a05de5.json => authorizations-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1-4b8125.json
 create mode 100644 src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1.json
 rename src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/__files/{authorizations-3f50c6b0-2730-45e7-9c94-f4f71bf61db2.json => authorizations-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/{authorizations-1-cdda4d.json => authorizations-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2-3f50c6.json
 create mode 100644 src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2.json
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository-7e3d0849-0e5e-4f69-a836-1dddb01af7e0.json => repos_github-api-test-org_temp-testcreaterepository-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_issues-606626d3-4ec8-4550-ae51-635d1b33f18a.json => repos_github-api-test-org_temp-testcreaterepository_issues-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_milestones-c1bb6957-ff70-4683-b8fd-4b7988cddf30.json => repos_github-api-test-org_temp-testcreaterepository_milestones-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_releases-dc00c291-6359-453c-b7d9-ffc7e2c99ddb.json => repos_github-api-test-org_temp-testcreaterepository_releases-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_releases-dc82f39e-dd3d-4d58-b635-761bb93f77c7.json => repos_github-api-test-org_temp-testcreaterepository_releases-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-ed473c58-ee06-4632-a9fd-99a3972024c5.json => repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-42bb605f-8031-41c8-9749-2c23af78edee.json => repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-7f61d00c-320b-417f-b155-39a8ff3c33ae.json => repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/{user-864ebeb8-bf07-40c2-a910-3a3e54f81865.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2-7e3d08.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5-606626.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4-c1bb69.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4.json
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/{repos_github-api-test-org_temp-testcreaterepository_releases-3-16498f.json => repos_github-api-test-org_temp-testcreaterepository_releases-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6-dc00c2.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7-dc82f3.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10-ed473c.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/{repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-12-383e6f.json => repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-12.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8-42bb60.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/{repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-11-864573.json => repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-11.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9-7f61d0.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1-864ebe.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/__files/{repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-3069f0eb-aba0-4cc2-9bad-8aaa4e27e676.json => repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1-3069f0.json
 create mode 100644 src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/{repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json => repos_github-api-test-org_temp-testratelimithandler_fail-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/{repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json => repos_github-api-test-org_temp-testratelimithandler_fail-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/{repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json => repos_github-api-test-org_temp-testratelimithandler_fail-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/{user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/{repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json => repos_github-api-test-org_temp-testratelimithandler_fail-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json
 create mode 100644 src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/{orgs_github-api-88d7178c-b996-494c-a515-2c25a84b963e.json => orgs_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/{repos_github-api_github-api-3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/{repos_github-api_github-api_traffic_clones-08a276dd-fb7e-4c16-948f-0540ab719bc3.json => repos_github-api_github-api_traffic_clones-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/{user-b88f8444-c789-46b4-aa97-2e712ef5f1d3.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2-88d717.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3-3e4826.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4-08a276.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1-b88f84.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/{orgs_github-api-test-org-cc28e414-38a3-4ca3-8b8a-15287f162c45.json => orgs_github-api-test-org-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/{repos_github-api-test-org_github-api-3e1a6044-86b2-4e41-9740-162d5972b659.json => repos_github-api-test-org_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/{user-bc05b9c5-0076-4faa-9747-ba5ce1ca2462.json => user-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1-cc28e4.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2-3e1a60.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2.json
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/{repos_github-api-test-org_github-api_traffic_clones-4-8036aa.json => repos_github-api-test-org_github-api_traffic_clones-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/{repos_github-api-test-org_github-api_traffic_views-3-fe2649.json => repos_github-api-test-org_github-api_traffic_views-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5-bc05b9.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5.json
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/{orgs_github-api-19310510-9871-43b9-95a2-e913f458c49e.json => orgs_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/{repos_github-api_github-api-266803c7-4757-493c-b2d0-affe324ff2ec.json => repos_github-api_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/{repos_github-api_github-api_traffic_views-1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e.json => repos_github-api_github-api_traffic_views-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/{user-45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2-193105.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3-266803.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4-1b9b0f.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1-45a8ae.json
 create mode 100644 src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-0c314f70-2669-4eab-bf2e-f5589d189fc3.json => orgs_github-api-test-org-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-11c34ac5-e571-4be0-908f-34f415756461.json => orgs_github-api-test-org-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-1697d11d-e650-4abb-8133-76adca36d207.json => orgs_github-api-test-org-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-18196674-89f3-4d83-b040-8ba040eefd49.json => orgs_github-api-test-org-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-2207e235-976a-4140-903a-377a8dd1746c.json => orgs_github-api-test-org-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-26564f19-513b-412a-8a71-299fc5559107.json => orgs_github-api-test-org-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-29f32c7d-9a05-4c8f-9d30-ccfd0600e382.json => orgs_github-api-test-org-18.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-3ff83aaf-e95a-4822-a07d-ce5ed0a69d72.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-41b780e5-520d-40c9-96a0-5706f9d1f7cd.json => orgs_github-api-test-org-20.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-5b634f3d-fc06-4fe5-881e-939025d44b3e.json => orgs_github-api-test-org-21.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-679857c5-9fbc-4649-a3ba-e16f6d3dd634.json => orgs_github-api-test-org-22.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-6c31e6bc-0743-4129-9d14-971c4ccc206b.json => orgs_github-api-test-org-23.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-87ba7d98-2c27-4e74-b00d-7e68b2edf46b.json => orgs_github-api-test-org-24.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-a56b2a87-ca72-4563-a260-8fa3edbc01c8.json => orgs_github-api-test-org-25.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-ab454363-9011-43bb-b8ad-25db5e637745.json => orgs_github-api-test-org-27.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-aed0ad15-f9fa-46ae-ab69-21636107fa98.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-b58aab3d-fba1-4ade-8f09-9f4454ed9503.json => orgs_github-api-test-org-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-dbc7af41-968a-4896-ab95-ab2517627b62.json => orgs_github-api-test-org-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-e1da686a-60ab-4ae1-bd38-50e48fbd8359.json => orgs_github-api-test-org-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-e8bcc900-cf03-4965-b873-cb3dd08d96a9.json => orgs_github-api-test-org-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{orgs_github-api-test-org-e9b92506-2108-4a5a-857a-7148561f8f9f.json => orgs_github-api-test-org-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{user-2fd80c42-5b79-4ccd-992e-e11223b55091.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{user-733192e5-f8b3-4498-bf3f-e89fa280bced.json => user-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{user-944cefaf-a462-4bbf-8f09-87612eb625c7.json => user-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{user-b8119a27-5fa5-406a-b5f6-c0d3a966b529.json => user-19.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{user-bfd48b7a-b57d-421c-8624-c024e0d637a0.json => user-26.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/{user-f66a5d48-3dda-4b5a-91b7-720423ae348d.json => user-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11-5b634f.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12-29f32c.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13-181966.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14-11c34a.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15-41b780.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16-6c31e6.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18-b58aab.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2-2207e2.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20-1697d1.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21-ab4543.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22-a56b2a.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23-e9b925.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24-aed0ad.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25-0c314f.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27-87ba7d.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3-679857.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4-26564f.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5-e8bcc9.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6-e1da68.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7-dbc7af.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9-3ff83a.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1-733192.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10-2fd80c.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17-944cef.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19-bfd48b.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26-f66a5d.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8-b8119a.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/{orgs_github-api-test-org-622cfe3b-ae86-4b2c-b2c3-97fc698c11a3.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/{user-5410872a-37cf-4246-acce-600f3271d30d.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/{user-701c4dd4-9fd7-4318-b2fc-555134913ada.json => user-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/{user-8ce0df73-96ad-4477-9ccf-5264e6e47d68.json => user-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2-622cfe.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/{orgs_github-api-test-org-missing-4-89ad96.json => orgs_github-api-test-org-missing-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/{orgs_github-api-test-org-missing-6-8ded92.json => orgs_github-api-test-org-missing-6.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1-701c4d.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3-541087.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5-8ce0df.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-06661cc8-79e8-4092-8d57-4971754c4f67.json => orgs_github-api-test-org-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-2a62d2db-5cc9-4266-9859-95513efd4fea.json => orgs_github-api-test-org-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-2cd18bd9-8a1f-454d-be74-85611906796b.json => orgs_github-api-test-org-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-466537f0-745f-41d3-a650-e4fcfbd59e65.json => orgs_github-api-test-org-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-553b71f9-eff3-45b8-ae76-833e137297ac.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-5efe6d8a-e833-4fd9-9213-d3be1cfdabc7.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-62ca8648-119b-448f-86c6-97928378f834.json => orgs_github-api-test-org-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-8f46cc12-8654-414a-8706-8584aa642cd9.json => orgs_github-api-test-org-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{orgs_github-api-test-org-ff502c42-96ef-419d-b8d0-4381e1541b45.json => orgs_github-api-test-org-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{user-03f5d1e3-0add-4dac-9f9c-48145c86cec0.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{user-28c110e8-5558-4fc4-aee4-e5df36b88ce7.json => user-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{user-6e140e39-8c0e-41ef-83be-438d573acced.json => user-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{user-816c95a5-01d4-42ab-91cf-bd308ca9780b.json => user-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{user-c3924d32-a472-4ec5-af6f-242f9529066c.json => user-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/{user-d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2.json => user-9.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10-2cd18b.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12-5efe6d.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13-553b71.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15-2a62d2.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2-62ca86.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3-466537.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5-ff502c.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7-06661c.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8-8f46cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1-c3924d.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11-03f5d1.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14-d81fbd.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4-816c95.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6-28c110.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9-6e140e.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/{orgs_github-api-test-org-b23279af-42c2-47ec-8cd5-d0e539893e37.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/{orgs_github-api-test-org-c4f47d35-3379-4ed9-ab34-8cf9d6bdf278.json => orgs_github-api-test-org-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/{user-6e1f2378-989b-4c01-942b-1dbe62c37828.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/{user-ec7ea0b8-43cf-453d-93f3-3a95646e5e49.json => user-3.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2-c4f47d.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4-b23279.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1-6e1f23.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3-ec7ea0.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/{orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/{repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/{repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json => repos_github-api-test-org_github-api_branches_test_timeout-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/{user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2-5e8ae8.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3-30364e.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1-c92cdb.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/{orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/{repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/{repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json => repos_github-api-test-org_github-api_branches_test_timeout-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/{user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2-5e8ae8.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3-30364e.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1-c92cdb.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/{orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json => orgs_github-api-test-org-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/{repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json => repos_github-api-test-org_github-api-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/{repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json => repos_github-api-test-org_github-api_branches_test_timeout-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/{user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2-5e8ae8.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3-30364e.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1-c92cdb.json
 create mode 100644 src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/{repos_github-api_github-api-0a34447d-6390-42da-ad5b-25bb566547f0.json => repos_github-api_github-api-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/{user-b4b6d514-c9e8-488f-802f-35e51d3ba5b3.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2-0a3444.json
 create mode 100644 src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1-b4b6d5.json
 create mode 100644 src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/__files/{user-67d218ce-0abd-4a0a-98ea-626565e977ca.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1-67d218.json
 create mode 100644 src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/{orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/{repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/{repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json => repos_github-api-test-org_github-api_git_refs-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/{user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json => user-1.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/{user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json => user-2.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3-18671a.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4-dac6a9.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12.json
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs-6-d5310e.json => repos_github-api-test-org_github-api_git_refs-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json => repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/{repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json => repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1-0e4fff.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2-ba9eb8.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{orgs_github-api-test-org-735e8274-2b9f-4e56-b7eb-efb51671aa16.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{rate_limit-56a45440-7250-4615-9e39-f32ed5f24d40.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-06582096-97d7-484a-9f75-97f38540d4ba.json => repos_github-api-test-org_github-api-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-52d2b85d-6f62-441f-9c39-f8431db45130.json => repos_github-api-test-org_github-api-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-931c2ba3-3b54-426d-a611-5c8a8dc7e400.json => repos_github-api-test-org_github-api-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-af0497da-2a7b-46d0-9dc0-8feddfc9dc6c.json => repos_github-api-test-org_github-api-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-1ed5a89a-3504-4e58-8feb-36ea82bc0fc6.json => repos_github-api-test-org_github-api-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-b529a21c-daaa-49ea-80ad-5d67b3c1a6fb.json => repos_github-api-test-org_github-api-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-cec25305-37b3-4ab0-a5ba-2f7513798ed1.json => repos_github-api-test-org_github-api-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-e79386f9-0358-4760-af21-eefcff4a37c8.json => repos_github-api-test-org_github-api-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-1f9c125d-f4b9-4cf2-a577-db6653212d6a.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-5f00134d-2aea-477a-8bcc-eddf19710263.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-bcd9c446-f8cb-4092-a284-5009153aed91.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-cafca820-5725-492f-abaf-12b2c96adbc6.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-ce1bc2f8-f17e-463b-a950-02487f6d5dbe.json => repos_github-api-test-org_github-api-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{repos_github-api-test-org_github-api-ca8e64d2-a8af-4c75-af59-63b51e2eb716.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/{user-b5238674-bdba-4cb5-ae17-49108689843a.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3-735e82.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2-56a454.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10-ca8e64.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11-065820.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12-af0497.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13-52d2b8.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14-cec253.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15-1ed5a8.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16-b529a2.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17-e79386.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4-cafca8.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5-1f9c12.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6-ce1bc2.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7-bcd9c4.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8-5f0013.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9-931c2b.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1-b52386.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{orgs_github-api-test-org-ec2931f3-a8cd-4482-a866-aca52276d270.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{rate_limit-36588a64-cb68-4ea5-8995-c2cdced6b84a.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{repos_github-api-test-org_github-api-0db05723-d8ab-412d-bcaf-fa416eb44138.json => repos_github-api-test-org_github-api-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{repos_github-api-test-org_github-api-7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0.json => repos_github-api-test-org_github-api-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{repos_github-api-test-org_github-api-b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{repos_github-api-test-org_github-api-5432b23c-70f2-4ecf-a380-a232afeef015.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/{user-5dbb2b95-e55b-4185-b143-ec3f21495fa6.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-11-11-2e2a6e.json => repos_github-api-test-org_github-api-11-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-12-12-a9ae79.json => repos_github-api-test-org_github-api-12-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-13-13-b2221a.json => repos_github-api-test-org_github-api-13-13.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-15-15-bc8d8b.json => repos_github-api-test-org_github-api-15-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-16-16-3857dc.json => repos_github-api-test-org_github-api-16-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-17-17-4d123b.json => repos_github-api-test-org_github-api-17-17.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-5-5-5e7b86.json => repos_github-api-test-org_github-api-5-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-6-6-e20958.json => repos_github-api-test-org_github-api-6-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-7-7-597005.json => repos_github-api-test-org_github-api-7-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/{repos_github-api-test-org_github-api-8-8-441d13.json => repos_github-api-test-org_github-api-8-8.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/{orgs_github-api-test-org-1d3815b7-1441-4a5d-a4eb-ffa13c700503.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/{rate_limit-b23929e7-7216-403a-b1c4-1b0c2ecf6f85.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/{repos_github-api-test-org_github-api-ec57e178-8204-439b-b45a-58c773fa46f6.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/{repos_github-api-test-org_github-api-02d53c37-9838-422a-9184-a08ef1487126.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/{repos_github-api-test-org_github-api-82db6373-85d8-4fc9-97c7-b98612c52402.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/{user-d958863f-a1fb-4a46-bc43-aeccd3eef451.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1.json
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{orgs_github-api-test-org-82590d42-fccd-4d3b-8f87-b5b9c1bb672b.json => orgs_github-api-test-org-3.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{rate_limit-e76bb3c7-edf0-4cc4-9e62-0163e5910625.json => rate_limit-2.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-14477383-aab7-4a52-8d72-47e1ad29a34d.json => repos_github-api-test-org_github-api-10.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-31849f9f-0c72-4167-b458-853164cbb677.json => repos_github-api-test-org_github-api-11.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-49fce600-b69e-4ef7-af64-594450ae1a1a.json => repos_github-api-test-org_github-api-12.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-703fd12f-995a-4af9-8504-10ff32c81100.json => repos_github-api-test-org_github-api-13.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-1ec048c4-808b-4541-a821-18f196cc23fe.json => repos_github-api-test-org_github-api-14.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-3e8ef833-99b0-4c1d-99e9-e7fd9cc26024.json => repos_github-api-test-org_github-api-15.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-8a71a8b0-9915-4365-b581-5ca05b407fc6.json => repos_github-api-test-org_github-api-16.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace.json => repos_github-api-test-org_github-api-17.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-50e14b70-b8b5-4124-bc6e-b7d68a05ef3a.json => repos_github-api-test-org_github-api-4.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-57466b15-e7fb-46de-88ca-2ab26cc0fe7d.json => repos_github-api-test-org_github-api-5.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-720bd2cb-d00e-46c5-903f-3456521e4345.json => repos_github-api-test-org_github-api-6.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-766326ea-da2e-4fe5-bea2-157db149047a.json => repos_github-api-test-org_github-api-7.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-99fb84f6-79c5-424c-ba10-007a9912567a.json => repos_github-api-test-org_github-api-8.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{repos_github-api-test-org_github-api-d7826ada-76b1-467b-b83e-9a1f3c30a719.json => repos_github-api-test-org_github-api-9.json} (100%)
 rename src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/{user-754481d3-2e4b-4ed4-92d0-73795dac7985.json => user-1.json} (100%)
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9.json
 delete mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json
 create mode 100644 src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1.json

diff --git a/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java b/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java
index 1f67275b7a..e0652f3aad 100644
--- a/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java
+++ b/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java
@@ -17,6 +17,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
@@ -120,7 +121,7 @@ protected void after() {
                         .extractTextBodiesOver(255));
 
         // After taking the snapshot, format the output
-        formatJsonFiles(new File(this.apiServer().getOptions().filesRoot().getPath()).toPath());
+        formatTestResources(new File(this.apiServer().getOptions().filesRoot().getPath()).toPath(), false);
 
         if (this.rawServer() != null) {
             this.rawServer()
@@ -132,7 +133,7 @@ protected void after() {
                             .extractTextBodiesOver(255));
 
             // For raw server, only fix up mapping files
-            formatJsonFiles(new File(this.rawServer().getOptions().filesRoot().child("mappings").getPath()).toPath());
+            formatTestResources(new File(this.rawServer().getOptions().filesRoot().getPath()).toPath(), true);
         }
 
         if (this.uploadsServer() != null) {
@@ -144,7 +145,7 @@ protected void after() {
                             .captureHeader("Accept")
                             .extractTextBodiesOver(255));
 
-            formatJsonFiles(new File(this.uploadsServer().getOptions().filesRoot().getPath()).toPath());
+            formatTestResources(new File(this.uploadsServer().getOptions().filesRoot().getPath()).toPath(), false);
 
         }
     }
@@ -157,7 +158,7 @@ public static int getRequestCount(WireMockServer server) {
         return server.countRequestsMatching(RequestPatternBuilder.allRequests().build()).getCount();
     }
 
-    private void formatJsonFiles(Path path) {
+    private void formatTestResources(Path path, boolean isRawServer) {
         // The more consistent we can make the json output the more meaningful it will be.
         Gson g = new Gson().newBuilder()
                 .serializeNulls()
@@ -176,8 +177,32 @@ public JsonElement serialize(Double src, Type typeOfSrc, JsonSerializationContex
                 .create();
 
         try {
+            Map<String, String> idToIndex = new HashMap<>();
+
+            // Match all the ids to request indexes
             Files.walk(path).forEach(filePath -> {
                 try {
+                    if (filePath.toString().endsWith(".json") && filePath.toString().contains("/mappings/")) {
+                        String fileText = new String(Files.readAllBytes(filePath));
+                        Object parsedObject = g.fromJson(fileText, Object.class);
+                        addMappingId((Map<String, Object>) parsedObject, idToIndex);
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException("Files could not be read: " + filePath.toString(), e);
+                }
+            });
+
+            // Update all
+            Files.walk(path).forEach(filePath -> {
+                try {
+                    Map.Entry<String, String> entry = getId(filePath, idToIndex);
+                    if (entry != null) {
+                        filePath = renameFileToIndex(filePath, entry);
+                    }
+                    // For raw server, only fix up mapping files
+                    if (isRawServer && !filePath.toString().contains("mappings")) {
+                        return;
+                    }
                     if (filePath.toString().endsWith(".json")) {
                         String fileText = new String(Files.readAllBytes(filePath));
                         // while recording responses we replaced all github calls localhost
@@ -193,16 +218,18 @@ public JsonElement serialize(Double src, Type typeOfSrc, JsonSerializationContex
                             fileText = fileText.replace(this.uploadsServer().baseUrl(), "https://uploads.github.com");
                         }
 
+                        // point bodyFile in the mapping to the renamed body file
+                        if (entry != null && filePath.toString().contains("mappings")) {
+                            fileText = fileText.replace("-" + entry.getKey(), "-" + entry.getValue());
+                        }
+
                         // Can be Array or Map
                         Object parsedObject = g.fromJson(fileText, Object.class);
-                        if (parsedObject instanceof Map && filePath.toString().contains("mappings")) {
-                            filePath = renameMappingFile(filePath, (Map<String, Object>) parsedObject);
-                        }
                         fileText = g.toJson(parsedObject);
                         Files.write(filePath, fileText.getBytes());
                     }
                 } catch (Exception e) {
-                    throw new RuntimeException("Files could not be written", e);
+                    throw new RuntimeException("Files could not be written: " + filePath.toString(), e);
                 }
             });
         } catch (IOException e) {
@@ -210,20 +237,29 @@ public JsonElement serialize(Double src, Type typeOfSrc, JsonSerializationContex
         }
     }
 
-    private Path renameMappingFile(Path filePath, Map<String, Object> parsedObject) throws IOException {
-        // Shorten the file names
-        // For understandability, rename the files to include the response order
-        Path targetPath = filePath;
+    private void addMappingId(Map<String, Object> parsedObject, Map<String, String> idToIndex) {
         String id = (String) parsedObject.getOrDefault("id", null);
-        Long insertionIndex = ((Double) parsedObject.getOrDefault("insertionIndex", 0.0)).longValue();
+        long insertionIndex = ((Double) parsedObject.getOrDefault("insertionIndex", 0.0)).longValue();
         if (id != null && insertionIndex > 0) {
-            String filePathString = filePath.toString();
-            if (filePathString.contains(id)) {
-                targetPath = new File(filePathString.replace(id, insertionIndex.toString() + "-" + id.substring(0, 6)))
-                        .toPath();
-                Files.move(filePath, targetPath);
+            idToIndex.put(id, Long.toString(insertionIndex));
+        }
+    }
+
+    private Map.Entry<String, String> getId(Path filePath, Map<String, String> idToIndex) throws IOException {
+        Path targetPath = filePath;
+        String filePathString = filePath.toString();
+        for (Map.Entry<String, String> item : idToIndex.entrySet()) {
+            if (filePathString.contains(item.getKey())) {
+                return item;
             }
         }
+        return null;
+    }
+
+    private Path renameFileToIndex(Path filePath, Map.Entry<String, String> idToIndex) throws IOException {
+        String filePathString = filePath.toString();
+        Path targetPath = new File(filePathString.replace(idToIndex.getKey(), idToIndex.getValue())).toPath();
+        Files.move(filePath, targetPath);
 
         return targetPath;
     }
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
deleted file mode 100644
index 5ecaf7f506..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
new file mode 100644
index 0000000000..edbb0797ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "574da117-6845-46d8-b2c1-4415546ca670",
+  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
+      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
+    }
+  },
+  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json
deleted file mode 100644
index b13834e2e3..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json
new file mode 100644
index 0000000000..9f8414e2b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
deleted file mode 100644
index 5ecaf7f506..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
new file mode 100644
index 0000000000..edbb0797ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "574da117-6845-46d8-b2c1-4415546ca670",
+  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
+      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
+    }
+  },
+  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json
deleted file mode 100644
index b13834e2e3..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json
new file mode 100644
index 0000000000..9f8414e2b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
deleted file mode 100644
index 590fdfc13e..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testHandler_Wait",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Wait",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
new file mode 100644
index 0000000000..545ffcd63a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "574da117-6845-46d8-b2c1-4415546ca670",
+  "name": "repos_github-api-test-org_temp-testHandler_Wait",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testHandler_Wait",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
+      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
+    }
+  },
+  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json
deleted file mode 100644
index b13834e2e3..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json
new file mode 100644
index 0000000000..9f8414e2b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json
deleted file mode 100644
index b13834e2e3..0000000000
--- a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json
new file mode 100644
index 0000000000..9f8414e2b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api-db8eacb0-947c-4677-9780-1c1d1b8383eb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api-db8eacb0-947c-4677-9780-1c1d1b8383eb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8.txt b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8.txt
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.txt
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-72e1ca23-1f03-45b5-90a2-e6dd6467b2f9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-72e1ca23-1f03-45b5-90a2-e6dd6467b2f9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/user-8996d059-e95f-4604-a534-b734e99d9e15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/user-8996d059-e95f-4604-a534-b734e99d9e15.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2-db8eac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2-db8eac.json
deleted file mode 100644
index f92e83ff1d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2-db8eac.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "db8eacb0-947c-4677-9780-1c1d1b8383eb",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-db8eacb0-947c-4677-9780-1c1d1b8383eb.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4352",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD0:98FF:9ED63E:BB8EED:5DB3A13B"
-    }
-  },
-  "uuid": "db8eacb0-947c-4677-9780-1c1d1b8383eb",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..c3c539b976
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "db8eacb0-947c-4677-9780-1c1d1b8383eb",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4352",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD0:98FF:9ED63E:BB8EED:5DB3A13B"
+    }
+  },
+  "uuid": "db8eacb0-947c-4677-9780-1c1d1b8383eb",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3-6408bc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3-6408bc.json
deleted file mode 100644
index c8582f391b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3-6408bc.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8",
-  "name": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
-  "request": {
-    "url": "/repos/github-api/github-api/git/blobs/a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.v3.raw"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8.txt",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
-      "Content-Type": "text/plain; charset=iso-8859-1",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4351",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ffa971e80b5300a0fc0164a3114acb0f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; param=VERSION.raw",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD0:98FF:9ED64E:BB8F10:5DB3A13C"
-    }
-  },
-  "uuid": "6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.json
new file mode 100644
index 0000000000..ab41b85386
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8",
+  "name": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
+  "request": {
+    "url": "/repos/github-api/github-api/git/blobs/a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.v3.raw"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-3.txt",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
+      "Content-Type": "text/plain; charset=iso-8859-1",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4351",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ffa971e80b5300a0fc0164a3114acb0f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; param=VERSION.raw",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD0:98FF:9ED64E:BB8F10:5DB3A13C"
+    }
+  },
+  "uuid": "6408bcc8-3cd2-4e1a-a25b-a9fdc81972e8",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4-72e1ca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4-72e1ca.json
deleted file mode 100644
index 63799fbb73..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4-72e1ca.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "72e1ca23-1f03-45b5-90a2-e6dd6467b2f9",
-  "name": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
-  "request": {
-    "url": "/repos/github-api/github-api/git/blobs/a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-72e1ca23-1f03-45b5-90a2-e6dd6467b2f9.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4350",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"89459bc4c8c6c982a48ccd6cb6060fff\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD0:98FF:9ED65A:BB8F1C:5DB3A13C"
-    }
-  },
-  "uuid": "72e1ca23-1f03-45b5-90a2-e6dd6467b2f9",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
-  "requiredScenarioState": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json
new file mode 100644
index 0000000000..6d8821192e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json
@@ -0,0 +1,49 @@
+{
+  "id": "72e1ca23-1f03-45b5-90a2-e6dd6467b2f9",
+  "name": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
+  "request": {
+    "url": "/repos/github-api/github-api/git/blobs/a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_git_blobs_a12243f2fc5b8c2ba47dd677d0b0c7583539584d-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4350",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"89459bc4c8c6c982a48ccd6cb6060fff\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD0:98FF:9ED65A:BB8F1C:5DB3A13C"
+    }
+  },
+  "uuid": "72e1ca23-1f03-45b5-90a2-e6dd6467b2f9",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d",
+  "requiredScenarioState": "scenario-1-repos-github-api-github-api-git-blobs-a12243f2fc5b8c2ba47dd677d0b0c7583539584d-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1-8996d0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1-8996d0.json
deleted file mode 100644
index c3efd8758e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1-8996d0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8996d059-e95f-4604-a534-b734e99d9e15",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8996d059-e95f-4604-a534-b734e99d9e15.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4354",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD0:98FF:9ED62C:BB8EE6:5DB3A13B"
-    }
-  },
-  "uuid": "8996d059-e95f-4604-a534-b734e99d9e15",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1.json
new file mode 100644
index 0000000000..4d1ab2eaad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/blob/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8996d059-e95f-4604-a534-b734e99d9e15",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4354",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD0:98FF:9ED62C:BB8EE6:5DB3A13B"
+    }
+  },
+  "uuid": "8996d059-e95f-4604-a534-b734e99d9e15",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins-448d3f92-8488-4c5c-a81b-ca22a6039b39.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins-448d3f92-8488-4c5c-a81b-ca22a6039b39.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core-7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core-7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core_src-0566ab8b-d260-47cb-a6e6-fafa6fc2836c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core_src-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core_src-0566ab8b-d260-47cb-a6e6-fafa6fc2836c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/repos_jenkinsci_jenkins_contents_core_src-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/user-0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/user-0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2-448d3f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2-448d3f.json
deleted file mode 100644
index 7c12fb9f3e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2-448d3f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "448d3f92-8488-4c5c-a81b-ca22a6039b39",
-  "name": "repos_jenkinsci_jenkins",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins-448d3f92-8488-4c5c-a81b-ca22a6039b39.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4434",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8F:3649:E327A7:1091CF2:5DB3A103"
-    }
-  },
-  "uuid": "448d3f92-8488-4c5c-a81b-ca22a6039b39",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2.json
new file mode 100644
index 0000000000..2c3cc9beb5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "448d3f92-8488-4c5c-a81b-ca22a6039b39",
+  "name": "repos_jenkinsci_jenkins",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4434",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8F:3649:E327A7:1091CF2:5DB3A103"
+    }
+  },
+  "uuid": "448d3f92-8488-4c5c-a81b-ca22a6039b39",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3-7e1b6c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3-7e1b6c.json
deleted file mode 100644
index 1e0328255b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3-7e1b6c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7",
-  "name": "repos_jenkinsci_jenkins_contents_core",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/contents/core",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_contents_core-7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4433",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64e666d1755b0fc334c6c5d6a7ddeb2948f8313b\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8F:3649:E327B9:1091D1B:5DB3A104"
-    }
-  },
-  "uuid": "7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3.json
new file mode 100644
index 0000000000..070a4fc078
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7",
+  "name": "repos_jenkinsci_jenkins_contents_core",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/contents/core",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_contents_core-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4433",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64e666d1755b0fc334c6c5d6a7ddeb2948f8313b\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8F:3649:E327B9:1091D1B:5DB3A104"
+    }
+  },
+  "uuid": "7e1b6c60-f829-4e6a-a1e5-089cebc4e1c7",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4-0566ab.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4-0566ab.json
deleted file mode 100644
index eb66c51ada..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4-0566ab.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0566ab8b-d260-47cb-a6e6-fafa6fc2836c",
-  "name": "repos_jenkinsci_jenkins_contents_core_src",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/contents/core/src?ref=master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_contents_core_src-0566ab8b-d260-47cb-a6e6-fafa6fc2836c.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4432",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64e666d1755b0fc334c6c5d6a7ddeb2948f8313b\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8F:3649:E327C7:1091D2B:5DB3A104"
-    }
-  },
-  "uuid": "0566ab8b-d260-47cb-a6e6-fafa6fc2836c",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4.json
new file mode 100644
index 0000000000..cb6a53b599
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/repos_jenkinsci_jenkins_contents_core_src-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "0566ab8b-d260-47cb-a6e6-fafa6fc2836c",
+  "name": "repos_jenkinsci_jenkins_contents_core_src",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/contents/core/src?ref=master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_contents_core_src-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4432",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64e666d1755b0fc334c6c5d6a7ddeb2948f8313b\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8F:3649:E327C7:1091D2B:5DB3A104"
+    }
+  },
+  "uuid": "0566ab8b-d260-47cb-a6e6-fafa6fc2836c",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1-0cdbd9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1-0cdbd9.json
deleted file mode 100644
index 6c6199f3cb..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1-0cdbd9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4436",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8F:3649:E32786:1091CE0:5DB3A103"
-    }
-  },
-  "uuid": "0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1.json
new file mode 100644
index 0000000000..82257be851
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/directoryListing/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4436",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8F:3649:E32786:1091CE0:5DB3A103"
+    }
+  },
+  "uuid": "0cdbd9dc-1c6f-42f5-a4b5-9d5472b2a56b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user-8636c5bc-5f1d-45cf-8182-9e7926d5231e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user-8636c5bc-5f1d-45cf-8182-9e7926d5231e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user_memberships_orgs-29d7ac4b-573b-4044-a2b8-470ac1bf6335.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user_memberships_orgs-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user_memberships_orgs-29d7ac4b-573b-4044-a2b8-470ac1bf6335.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/__files/user_memberships_orgs-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1-8636c5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1-8636c5.json
deleted file mode 100644
index 4cfb73049c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1-8636c5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8636c5bc-5f1d-45cf-8182-9e7926d5231e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8636c5bc-5f1d-45cf-8182-9e7926d5231e.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4398",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAB4:5F2B:EE3A33:1187E2D:5DB3A112"
-    }
-  },
-  "uuid": "8636c5bc-5f1d-45cf-8182-9e7926d5231e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1.json
new file mode 100644
index 0000000000..6b271b083e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8636c5bc-5f1d-45cf-8182-9e7926d5231e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4398",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAB4:5F2B:EE3A33:1187E2D:5DB3A112"
+    }
+  },
+  "uuid": "8636c5bc-5f1d-45cf-8182-9e7926d5231e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2-29d7ac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2-29d7ac.json
deleted file mode 100644
index afa04ff10b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2-29d7ac.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "29d7ac4b-573b-4044-a2b8-470ac1bf6335",
-  "name": "user_memberships_orgs",
-  "request": {
-    "url": "/user/memberships/orgs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_memberships_orgs-29d7ac4b-573b-4044-a2b8-470ac1bf6335.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4396",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"421157c0a61f3834ed23839360e0441a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAB4:5F2B:EE3A4F:1187E42:5DB3A112"
-    }
-  },
-  "uuid": "29d7ac4b-573b-4044-a2b8-470ac1bf6335",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2.json
new file mode 100644
index 0000000000..a36896e34b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/listOrgMemberships/mappings/user_memberships_orgs-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "29d7ac4b-573b-4044-a2b8-470ac1bf6335",
+  "name": "user_memberships_orgs",
+  "request": {
+    "url": "/user/memberships/orgs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_memberships_orgs-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4396",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"421157c0a61f3834ed23839360e0441a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAB4:5F2B:EE3A4F:1187E42:5DB3A112"
+    }
+  },
+  "uuid": "29d7ac4b-573b-4044-a2b8-470ac1bf6335",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-a979348d-c6be-4cb7-8877-7c42a6f013ae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-a979348d-c6be-4cb7-8877-7c42a6f013ae.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-89714ed3-235b-4914-86a8-44ad66d59f30.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-89714ed3-235b-4914-86a8-44ad66d59f30.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-2b718339-36d3-4c6b-9484-79cdd79a79e4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-2b718339-36d3-4c6b-9484-79cdd79a79e4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-989db4b3-8dde-4065-b4ef-6a2d90a2753a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-989db4b3-8dde-4065-b4ef-6a2d90a2753a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-50b907ef-a983-4cc9-bfd2-e2ba76eae729.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-50b907ef-a983-4cc9-bfd2-e2ba76eae729.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-f2648b73-4af1-4be3-a2a4-9edc712c5d59.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-f2648b73-4af1-4be3-a2a4-9edc712c5d59.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-ee5a6c9f-da3a-47e7-a393-b403e82ae5d9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-ee5a6c9f-da3a-47e7-a393-b403e82ae5d9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-a41aeecf-7097-4ac6-b857-ab14797afe0a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-a41aeecf-7097-4ac6-b857-ab14797afe0a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-e1d519f7-9bd2-4fcd-a288-2391944ec7ca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-e1d519f7-9bd2-4fcd-a288-2391944ec7ca.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-1b694852-8043-418c-a76e-39370f22db96.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-1b694852-8043-418c-a76e-39370f22db96.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-d85867b0-1efe-43f5-bdf4-1b9aef03ef55.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-d85867b0-1efe-43f5-bdf4-1b9aef03ef55.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-48908278-ce2f-4cec-8662-6f4ca3d81226.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-48908278-ce2f-4cec-8662-6f4ca3d81226.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-20.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-42be6527-0570-4353-b42f-d0cae80258e3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-42be6527-0570-4353-b42f-d0cae80258e3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-21.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-5720c49c-c69b-495b-b7e6-b885d88c10b1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-5720c49c-c69b-495b-b7e6-b885d88c10b1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-22.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-045c369a-0818-455a-afe1-3ae9ec919af2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-045c369a-0818-455a-afe1-3ae9ec919af2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-23.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-bfc7733f-6dff-4675-81e9-926103c40b83.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-bfc7733f-6dff-4675-81e9-926103c40b83.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-24.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-ac22e3e2-f0d3-4ff1-af23-23e9c79c725c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-26.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-ac22e3e2-f0d3-4ff1-af23-23e9c79c725c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-26.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-d9617266-1ca6-44b2-b495-52c1f3be4b91.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-d9617266-1ca6-44b2-b495-52c1f3be4b91.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-6dea5253-3aa2-4484-b97a-effcad5c6ebd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-6dea5253-3aa2-4484-b97a-effcad5c6ebd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-a8e9449d-b78c-4e46-801e-59fc459920d3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-a8e9449d-b78c-4e46-801e-59fc459920d3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-2658e99a-6619-4b0b-b70f-814a0841839e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-2658e99a-6619-4b0b-b70f-814a0841839e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-f2524684-5156-4db6-97fa-10dedac5f779.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-f2524684-5156-4db6-97fa-10dedac5f779.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-9437189d-2f1b-47de-898d-66fde88ef05b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-9437189d-2f1b-47de-898d-66fde88ef05b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-1de52522-e900-4b19-90cd-758573c2349a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-1de52522-e900-4b19-90cd-758573c2349a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/notifications-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/user-8439ce2a-f18e-4395-9e5c-21604abb77ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/user-8439ce2a-f18e-4395-9e5c-21604abb77ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10-a97934.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10-a97934.json
deleted file mode 100644
index 7b1034c3c8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10-a97934.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a979348d-c6be-4cb7-8877-7c42a6f013ae",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=9",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-a979348d-c6be-4cb7-8877-7c42a6f013ae.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4272",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Fri, 04 Oct 2019 22:33:47 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F628:BFE1F0:5DB3A14D",
-      "Link": "<https://api.github.com/notifications?all=true&page=8>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=10>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "a979348d-c6be-4cb7-8877-7c42a6f013ae",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10.json
new file mode 100644
index 0000000000..2b90b99f7f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-10.json
@@ -0,0 +1,50 @@
+{
+  "id": "a979348d-c6be-4cb7-8877-7c42a6f013ae",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=9",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-10.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4272",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Fri, 04 Oct 2019 22:33:47 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F628:BFE1F0:5DB3A14D",
+      "Link": "<https://api.github.com/notifications?all=true&page=8>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=10>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "a979348d-c6be-4cb7-8877-7c42a6f013ae",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11-89714e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11-89714e.json
deleted file mode 100644
index 2cf135f2ba..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11-89714e.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "89714ed3-235b-4914-86a8-44ad66d59f30",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-89714ed3-235b-4914-86a8-44ad66d59f30.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4271",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Tue, 01 Oct 2019 22:44:33 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F646:BFE217:5DB3A14D",
-      "Link": "<https://api.github.com/notifications?all=true&page=9>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=11>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "89714ed3-235b-4914-86a8-44ad66d59f30",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11.json
new file mode 100644
index 0000000000..ab1e6d9364
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-11.json
@@ -0,0 +1,50 @@
+{
+  "id": "89714ed3-235b-4914-86a8-44ad66d59f30",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-11.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4271",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Tue, 01 Oct 2019 22:44:33 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F646:BFE217:5DB3A14D",
+      "Link": "<https://api.github.com/notifications?all=true&page=9>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=11>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "89714ed3-235b-4914-86a8-44ad66d59f30",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12-2b7183.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12-2b7183.json
deleted file mode 100644
index cbefeef0ce..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12-2b7183.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "2b718339-36d3-4c6b-9484-79cdd79a79e4",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=11",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-2b718339-36d3-4c6b-9484-79cdd79a79e4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4270",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Sun, 29 Sep 2019 17:59:57 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F657:BFE22B:5DB3A14D",
-      "Link": "<https://api.github.com/notifications?all=true&page=10>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=12>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "2b718339-36d3-4c6b-9484-79cdd79a79e4",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12.json
new file mode 100644
index 0000000000..fe28db2ce1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-12.json
@@ -0,0 +1,50 @@
+{
+  "id": "2b718339-36d3-4c6b-9484-79cdd79a79e4",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=11",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-12.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4270",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Sun, 29 Sep 2019 17:59:57 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F657:BFE22B:5DB3A14D",
+      "Link": "<https://api.github.com/notifications?all=true&page=10>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=12>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "2b718339-36d3-4c6b-9484-79cdd79a79e4",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13-989db4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13-989db4.json
deleted file mode 100644
index 9d6c641dff..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13-989db4.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "989db4b3-8dde-4065-b4ef-6a2d90a2753a",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=12",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-989db4b3-8dde-4065-b4ef-6a2d90a2753a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4269",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Wed, 25 Sep 2019 18:41:05 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F661:BFE238:5DB3A14E",
-      "Link": "<https://api.github.com/notifications?all=true&page=11>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=13>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "989db4b3-8dde-4065-b4ef-6a2d90a2753a",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13.json
new file mode 100644
index 0000000000..b8aa511366
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-13.json
@@ -0,0 +1,50 @@
+{
+  "id": "989db4b3-8dde-4065-b4ef-6a2d90a2753a",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=12",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-13.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4269",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Wed, 25 Sep 2019 18:41:05 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F661:BFE238:5DB3A14E",
+      "Link": "<https://api.github.com/notifications?all=true&page=11>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=13>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "989db4b3-8dde-4065-b4ef-6a2d90a2753a",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14-50b907.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14-50b907.json
deleted file mode 100644
index e498dad256..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14-50b907.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "50b907ef-a983-4cc9-bfd2-e2ba76eae729",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=13",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-50b907ef-a983-4cc9-bfd2-e2ba76eae729.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4268",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Sat, 21 Sep 2019 00:30:26 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F66D:BFE242:5DB3A14E",
-      "Link": "<https://api.github.com/notifications?all=true&page=12>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=14>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "50b907ef-a983-4cc9-bfd2-e2ba76eae729",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14.json
new file mode 100644
index 0000000000..7e640e7100
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-14.json
@@ -0,0 +1,50 @@
+{
+  "id": "50b907ef-a983-4cc9-bfd2-e2ba76eae729",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=13",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-14.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4268",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Sat, 21 Sep 2019 00:30:26 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F66D:BFE242:5DB3A14E",
+      "Link": "<https://api.github.com/notifications?all=true&page=12>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=14>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "50b907ef-a983-4cc9-bfd2-e2ba76eae729",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15-f2648b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15-f2648b.json
deleted file mode 100644
index 0574548b5a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15-f2648b.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "f2648b73-4af1-4be3-a2a4-9edc712c5d59",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=14",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-f2648b73-4af1-4be3-a2a4-9edc712c5d59.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4267",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:08:49 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F679:BFE254:5DB3A14E",
-      "Link": "<https://api.github.com/notifications?all=true&page=13>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=15>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "f2648b73-4af1-4be3-a2a4-9edc712c5d59",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15.json
new file mode 100644
index 0000000000..56050c541d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-15.json
@@ -0,0 +1,50 @@
+{
+  "id": "f2648b73-4af1-4be3-a2a4-9edc712c5d59",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=14",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-15.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4267",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:08:49 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F679:BFE254:5DB3A14E",
+      "Link": "<https://api.github.com/notifications?all=true&page=13>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=15>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "f2648b73-4af1-4be3-a2a4-9edc712c5d59",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16-ee5a6c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16-ee5a6c.json
deleted file mode 100644
index 5a11cd9b19..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16-ee5a6c.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ee5a6c9f-da3a-47e7-a393-b403e82ae5d9",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=15",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-ee5a6c9f-da3a-47e7-a393-b403e82ae5d9.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4266",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Wed, 11 Sep 2019 17:46:27 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F689:BFE266:5DB3A14E",
-      "Link": "<https://api.github.com/notifications?all=true&page=14>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=16>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "ee5a6c9f-da3a-47e7-a393-b403e82ae5d9",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16.json
new file mode 100644
index 0000000000..5187c79ef8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-16.json
@@ -0,0 +1,50 @@
+{
+  "id": "ee5a6c9f-da3a-47e7-a393-b403e82ae5d9",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=15",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-16.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4266",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Wed, 11 Sep 2019 17:46:27 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F689:BFE266:5DB3A14E",
+      "Link": "<https://api.github.com/notifications?all=true&page=14>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=16>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "ee5a6c9f-da3a-47e7-a393-b403e82ae5d9",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17-a41aee.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17-a41aee.json
deleted file mode 100644
index 8ac6ef0015..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17-a41aee.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a41aeecf-7097-4ac6-b857-ab14797afe0a",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=16",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-a41aeecf-7097-4ac6-b857-ab14797afe0a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4265",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Thu, 05 Sep 2019 21:37:55 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F69E:BFE27A:5DB3A14F",
-      "Link": "<https://api.github.com/notifications?all=true&page=15>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=17>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "a41aeecf-7097-4ac6-b857-ab14797afe0a",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17.json
new file mode 100644
index 0000000000..0607533b93
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-17.json
@@ -0,0 +1,50 @@
+{
+  "id": "a41aeecf-7097-4ac6-b857-ab14797afe0a",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=16",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-17.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4265",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Thu, 05 Sep 2019 21:37:55 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F69E:BFE27A:5DB3A14F",
+      "Link": "<https://api.github.com/notifications?all=true&page=15>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=17>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "a41aeecf-7097-4ac6-b857-ab14797afe0a",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18-e1d519.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18-e1d519.json
deleted file mode 100644
index 7de7150511..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18-e1d519.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "e1d519f7-9bd2-4fcd-a288-2391944ec7ca",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=17",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-e1d519f7-9bd2-4fcd-a288-2391944ec7ca.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4264",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Fri, 30 Aug 2019 01:19:53 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F6B4:BFE291:5DB3A14F",
-      "Link": "<https://api.github.com/notifications?all=true&page=16>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=18>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e1d519f7-9bd2-4fcd-a288-2391944ec7ca",
-  "persistent": true,
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18.json
new file mode 100644
index 0000000000..1ba4437bc8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-18.json
@@ -0,0 +1,50 @@
+{
+  "id": "e1d519f7-9bd2-4fcd-a288-2391944ec7ca",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=17",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-18.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4264",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Fri, 30 Aug 2019 01:19:53 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F6B4:BFE291:5DB3A14F",
+      "Link": "<https://api.github.com/notifications?all=true&page=16>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=18>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e1d519f7-9bd2-4fcd-a288-2391944ec7ca",
+  "persistent": true,
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19-1b6948.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19-1b6948.json
deleted file mode 100644
index 1e775d596d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19-1b6948.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "1b694852-8043-418c-a76e-39370f22db96",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=18",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-1b694852-8043-418c-a76e-39370f22db96.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4263",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Mon, 26 Aug 2019 15:07:19 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F6CA:BFE2B2:5DB3A14F",
-      "Link": "<https://api.github.com/notifications?all=true&page=17>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=19>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1b694852-8043-418c-a76e-39370f22db96",
-  "persistent": true,
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19.json
new file mode 100644
index 0000000000..8694e34167
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-19.json
@@ -0,0 +1,50 @@
+{
+  "id": "1b694852-8043-418c-a76e-39370f22db96",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=18",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-19.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4263",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Mon, 26 Aug 2019 15:07:19 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F6CA:BFE2B2:5DB3A14F",
+      "Link": "<https://api.github.com/notifications?all=true&page=17>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=19>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1b694852-8043-418c-a76e-39370f22db96",
+  "persistent": true,
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2-d85867.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2-d85867.json
deleted file mode 100644
index 5a5fced60b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2-d85867.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "d85867b0-1efe-43f5-bdf4-1b9aef03ef55",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-d85867b0-1efe-43f5-bdf4-1b9aef03ef55.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4280",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Sat, 26 Oct 2019 00:58:29 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5C2:BFE16E:5DB3A14B",
-      "Link": "<https://api.github.com/notifications?all=true&page=2>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\""
-    }
-  },
-  "uuid": "d85867b0-1efe-43f5-bdf4-1b9aef03ef55",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2.json
new file mode 100644
index 0000000000..b8786ae3a7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-2.json
@@ -0,0 +1,50 @@
+{
+  "id": "d85867b0-1efe-43f5-bdf4-1b9aef03ef55",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4280",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Sat, 26 Oct 2019 00:58:29 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5C2:BFE16E:5DB3A14B",
+      "Link": "<https://api.github.com/notifications?all=true&page=2>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\""
+    }
+  },
+  "uuid": "d85867b0-1efe-43f5-bdf4-1b9aef03ef55",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20-489082.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20-489082.json
deleted file mode 100644
index 8968c83d56..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20-489082.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "48908278-ce2f-4cec-8662-6f4ca3d81226",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=19",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-48908278-ce2f-4cec-8662-6f4ca3d81226.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4262",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Wed, 21 Aug 2019 16:00:35 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F6E4:BFE2D4:5DB3A150",
-      "Link": "<https://api.github.com/notifications?all=true&page=18>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=20>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "48908278-ce2f-4cec-8662-6f4ca3d81226",
-  "persistent": true,
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20.json
new file mode 100644
index 0000000000..c5de96ef5c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-20.json
@@ -0,0 +1,50 @@
+{
+  "id": "48908278-ce2f-4cec-8662-6f4ca3d81226",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=19",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-20.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4262",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Wed, 21 Aug 2019 16:00:35 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F6E4:BFE2D4:5DB3A150",
+      "Link": "<https://api.github.com/notifications?all=true&page=18>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=20>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "48908278-ce2f-4cec-8662-6f4ca3d81226",
+  "persistent": true,
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21-42be65.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21-42be65.json
deleted file mode 100644
index 5415126afe..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21-42be65.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "42be6527-0570-4353-b42f-d0cae80258e3",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=20",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-42be6527-0570-4353-b42f-d0cae80258e3.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4261",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Fri, 16 Aug 2019 01:10:46 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F70C:BFE300:5DB3A150",
-      "Link": "<https://api.github.com/notifications?all=true&page=19>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=21>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "42be6527-0570-4353-b42f-d0cae80258e3",
-  "persistent": true,
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21.json
new file mode 100644
index 0000000000..4f2eee5101
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-21.json
@@ -0,0 +1,50 @@
+{
+  "id": "42be6527-0570-4353-b42f-d0cae80258e3",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=20",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-21.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4261",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Fri, 16 Aug 2019 01:10:46 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F70C:BFE300:5DB3A150",
+      "Link": "<https://api.github.com/notifications?all=true&page=19>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=21>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "42be6527-0570-4353-b42f-d0cae80258e3",
+  "persistent": true,
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22-5720c4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22-5720c4.json
deleted file mode 100644
index b3f2db4798..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22-5720c4.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "5720c49c-c69b-495b-b7e6-b885d88c10b1",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=21",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-5720c49c-c69b-495b-b7e6-b885d88c10b1.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4260",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Thu, 08 Aug 2019 20:39:15 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F71C:BFE311:5DB3A150",
-      "Link": "<https://api.github.com/notifications?all=true&page=20>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=22>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "5720c49c-c69b-495b-b7e6-b885d88c10b1",
-  "persistent": true,
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22.json
new file mode 100644
index 0000000000..28b29a03b9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-22.json
@@ -0,0 +1,50 @@
+{
+  "id": "5720c49c-c69b-495b-b7e6-b885d88c10b1",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=21",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-22.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4260",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Thu, 08 Aug 2019 20:39:15 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F71C:BFE311:5DB3A150",
+      "Link": "<https://api.github.com/notifications?all=true&page=20>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=22>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "5720c49c-c69b-495b-b7e6-b885d88c10b1",
+  "persistent": true,
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23-045c36.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23-045c36.json
deleted file mode 100644
index 2079054223..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23-045c36.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "045c369a-0818-455a-afe1-3ae9ec919af2",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=22",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-045c369a-0818-455a-afe1-3ae9ec919af2.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4259",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Fri, 02 Aug 2019 03:50:24 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F731:BFE31F:5DB3A151",
-      "Link": "<https://api.github.com/notifications?all=true&page=21>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=23>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "045c369a-0818-455a-afe1-3ae9ec919af2",
-  "persistent": true,
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23.json
new file mode 100644
index 0000000000..e713fa4ff3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-23.json
@@ -0,0 +1,50 @@
+{
+  "id": "045c369a-0818-455a-afe1-3ae9ec919af2",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=22",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-23.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4259",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Fri, 02 Aug 2019 03:50:24 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F731:BFE31F:5DB3A151",
+      "Link": "<https://api.github.com/notifications?all=true&page=21>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=23>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "045c369a-0818-455a-afe1-3ae9ec919af2",
+  "persistent": true,
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24-bfc773.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24-bfc773.json
deleted file mode 100644
index a08a43a0cd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24-bfc773.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "bfc7733f-6dff-4675-81e9-926103c40b83",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=23",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-bfc7733f-6dff-4675-81e9-926103c40b83.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4258",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Fri, 05 Jul 2019 21:37:24 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F73A:BFE332:5DB3A151",
-      "Link": "<https://api.github.com/notifications?all=true&page=22>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "bfc7733f-6dff-4675-81e9-926103c40b83",
-  "persistent": true,
-  "insertionIndex": 24
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24.json
new file mode 100644
index 0000000000..195fbf6d16
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-24.json
@@ -0,0 +1,50 @@
+{
+  "id": "bfc7733f-6dff-4675-81e9-926103c40b83",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=23",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-24.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4258",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Fri, 05 Jul 2019 21:37:24 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F73A:BFE332:5DB3A151",
+      "Link": "<https://api.github.com/notifications?all=true&page=22>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "bfc7733f-6dff-4675-81e9-926103c40b83",
+  "persistent": true,
+  "insertionIndex": 24
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26-ac22e3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26-ac22e3.json
deleted file mode 100644
index 4d93819fa7..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26-ac22e3.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ac22e3e2-f0d3-4ff1-af23-23e9c79c725c",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-ac22e3e2-f0d3-4ff1-af23-23e9c79c725c.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4256",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Sat, 26 Oct 2019 00:58:29 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F759:BFE352:5DB3A151",
-      "Link": "<https://api.github.com/notifications?page=2>; rel=\"next\", <https://api.github.com/notifications?page=5>; rel=\"last\""
-    }
-  },
-  "uuid": "ac22e3e2-f0d3-4ff1-af23-23e9c79c725c",
-  "persistent": true,
-  "insertionIndex": 26
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26.json
new file mode 100644
index 0000000000..915d3a5484
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-26.json
@@ -0,0 +1,50 @@
+{
+  "id": "ac22e3e2-f0d3-4ff1-af23-23e9c79c725c",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-26.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4256",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Sat, 26 Oct 2019 00:58:29 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F759:BFE352:5DB3A151",
+      "Link": "<https://api.github.com/notifications?page=2>; rel=\"next\", <https://api.github.com/notifications?page=5>; rel=\"last\""
+    }
+  },
+  "uuid": "ac22e3e2-f0d3-4ff1-af23-23e9c79c725c",
+  "persistent": true,
+  "insertionIndex": 26
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3-d96172.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3-d96172.json
deleted file mode 100644
index 31763f85e1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3-d96172.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "d9617266-1ca6-44b2-b495-52c1f3be4b91",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-d9617266-1ca6-44b2-b495-52c1f3be4b91.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4279",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Thu, 24 Oct 2019 06:44:20 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5D0:BFE187:5DB3A14B",
-      "Link": "<https://api.github.com/notifications?all=true&page=1>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=3>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d9617266-1ca6-44b2-b495-52c1f3be4b91",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3.json
new file mode 100644
index 0000000000..095c7b5460
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "d9617266-1ca6-44b2-b495-52c1f3be4b91",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4279",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Thu, 24 Oct 2019 06:44:20 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5D0:BFE187:5DB3A14B",
+      "Link": "<https://api.github.com/notifications?all=true&page=1>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=3>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d9617266-1ca6-44b2-b495-52c1f3be4b91",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4-6dea52.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4-6dea52.json
deleted file mode 100644
index 34e1ac1ba6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4-6dea52.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "6dea5253-3aa2-4484-b97a-effcad5c6ebd",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-6dea5253-3aa2-4484-b97a-effcad5c6ebd.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4278",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Tue, 22 Oct 2019 09:35:07 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5DC:BFE198:5DB3A14B",
-      "Link": "<https://api.github.com/notifications?all=true&page=2>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=4>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6dea5253-3aa2-4484-b97a-effcad5c6ebd",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4.json
new file mode 100644
index 0000000000..4475ac135a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-4.json
@@ -0,0 +1,50 @@
+{
+  "id": "6dea5253-3aa2-4484-b97a-effcad5c6ebd",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4278",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Tue, 22 Oct 2019 09:35:07 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5DC:BFE198:5DB3A14B",
+      "Link": "<https://api.github.com/notifications?all=true&page=2>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=4>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6dea5253-3aa2-4484-b97a-effcad5c6ebd",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5-a8e944.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5-a8e944.json
deleted file mode 100644
index 0569cf5383..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5-a8e944.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a8e9449d-b78c-4e46-801e-59fc459920d3",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-a8e9449d-b78c-4e46-801e-59fc459920d3.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4277",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Mon, 21 Oct 2019 00:22:13 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5E4:BFE1A3:5DB3A14C",
-      "Link": "<https://api.github.com/notifications?all=true&page=3>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=5>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "a8e9449d-b78c-4e46-801e-59fc459920d3",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5.json
new file mode 100644
index 0000000000..e06a61859d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-5.json
@@ -0,0 +1,50 @@
+{
+  "id": "a8e9449d-b78c-4e46-801e-59fc459920d3",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-5.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4277",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Mon, 21 Oct 2019 00:22:13 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5E4:BFE1A3:5DB3A14C",
+      "Link": "<https://api.github.com/notifications?all=true&page=3>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=5>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "a8e9449d-b78c-4e46-801e-59fc459920d3",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6-2658e9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6-2658e9.json
deleted file mode 100644
index 1205f145f9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6-2658e9.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "2658e99a-6619-4b0b-b70f-814a0841839e",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-2658e99a-6619-4b0b-b70f-814a0841839e.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4276",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Wed, 16 Oct 2019 14:14:48 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5F0:BFE1B4:5DB3A14C",
-      "Link": "<https://api.github.com/notifications?all=true&page=4>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=6>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "2658e99a-6619-4b0b-b70f-814a0841839e",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6.json
new file mode 100644
index 0000000000..87f8a8fbc7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-6.json
@@ -0,0 +1,50 @@
+{
+  "id": "2658e99a-6619-4b0b-b70f-814a0841839e",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-6.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4276",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Wed, 16 Oct 2019 14:14:48 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5F0:BFE1B4:5DB3A14C",
+      "Link": "<https://api.github.com/notifications?all=true&page=4>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=6>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "2658e99a-6619-4b0b-b70f-814a0841839e",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7-f25246.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7-f25246.json
deleted file mode 100644
index d93a90b6a0..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7-f25246.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "f2524684-5156-4db6-97fa-10dedac5f779",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-f2524684-5156-4db6-97fa-10dedac5f779.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4275",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Mon, 14 Oct 2019 19:33:42 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5FD:BFE1C1:5DB3A14C",
-      "Link": "<https://api.github.com/notifications?all=true&page=5>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=7>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "f2524684-5156-4db6-97fa-10dedac5f779",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7.json
new file mode 100644
index 0000000000..65524be45a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "f2524684-5156-4db6-97fa-10dedac5f779",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-7.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4275",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Mon, 14 Oct 2019 19:33:42 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5FD:BFE1C1:5DB3A14C",
+      "Link": "<https://api.github.com/notifications?all=true&page=5>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=7>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "f2524684-5156-4db6-97fa-10dedac5f779",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8-943718.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8-943718.json
deleted file mode 100644
index 4876ec37d7..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8-943718.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "9437189d-2f1b-47de-898d-66fde88ef05b",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-9437189d-2f1b-47de-898d-66fde88ef05b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4274",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Thu, 10 Oct 2019 17:05:03 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F60A:BFE1CD:5DB3A14C",
-      "Link": "<https://api.github.com/notifications?all=true&page=6>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=8>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "9437189d-2f1b-47de-898d-66fde88ef05b",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8.json
new file mode 100644
index 0000000000..6192900ac5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-8.json
@@ -0,0 +1,50 @@
+{
+  "id": "9437189d-2f1b-47de-898d-66fde88ef05b",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-8.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4274",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Thu, 10 Oct 2019 17:05:03 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F60A:BFE1CD:5DB3A14C",
+      "Link": "<https://api.github.com/notifications?all=true&page=6>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=8>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "9437189d-2f1b-47de-898d-66fde88ef05b",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9-1de525.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9-1de525.json
deleted file mode 100644
index ad4018bf49..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9-1de525.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "1de52522-e900-4b19-90cd-758573c2349a",
-  "name": "notifications",
-  "request": {
-    "url": "/notifications?all=true&page=8",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "notifications-1de52522-e900-4b19-90cd-758573c2349a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4273",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"\"",
-      "Last-Modified": "Tue, 08 Oct 2019 15:10:07 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "notifications, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F612:BFE1D9:5DB3A14C",
-      "Link": "<https://api.github.com/notifications?all=true&page=7>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=9>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1de52522-e900-4b19-90cd-758573c2349a",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9.json
new file mode 100644
index 0000000000..220e7b2176
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "1de52522-e900-4b19-90cd-758573c2349a",
+  "name": "notifications",
+  "request": {
+    "url": "/notifications?all=true&page=8",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "notifications-9.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4273",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"\"",
+      "Last-Modified": "Tue, 08 Oct 2019 15:10:07 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "notifications, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F612:BFE1D9:5DB3A14C",
+      "Link": "<https://api.github.com/notifications?all=true&page=7>; rel=\"prev\", <https://api.github.com/notifications?all=true&page=9>; rel=\"next\", <https://api.github.com/notifications?all=true&page=23>; rel=\"last\", <https://api.github.com/notifications?all=true&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1de52522-e900-4b19-90cd-758573c2349a",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications_threads_523050578-25-3b5fa2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications_threads_523050578-25.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications_threads_523050578-25-3b5fa2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/notifications_threads_523050578-25.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1-8439ce.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1-8439ce.json
deleted file mode 100644
index 92128bc62f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1-8439ce.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8439ce2a-f18e-4395-9e5c-21604abb77ec",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8439ce2a-f18e-4395-9e5c-21604abb77ec.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4282",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB13:833E:A1F5AB:BFE15F:5DB3A14B"
-    }
-  },
-  "uuid": "8439ce2a-f18e-4395-9e5c-21604abb77ec",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1.json
new file mode 100644
index 0000000000..a6acd0a9e4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/notifications/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8439ce2a-f18e-4395-9e5c-21604abb77ec",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4282",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB13:833E:A1F5AB:BFE15F:5DB3A14B"
+    }
+  },
+  "uuid": "8439ce2a-f18e-4395-9e5c-21604abb77ec",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api-66f6b3ba-129b-441c-9f2f-c9e18c941eea.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api-66f6b3ba-129b-441c-9f2f-c9e18c941eea.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311-1e8e21ad-edaf-4647-b812-4046b8f71a3a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311-1e8e21ad-edaf-4647-b812-4046b8f71a3a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-1a36428c-ce04-4580-b160-ffc42b4629ff.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-1a36428c-ce04-4580-b160-ffc42b4629ff.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-41bca581-4ce9-4d1a-94ee-407bb996afc8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-41bca581-4ce9-4d1a-94ee-407bb996afc8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-ec5b4512-28c1-46fe-95d2-710c6da55cb3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-ec5b4512-28c1-46fe-95d2-710c6da55cb3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-39f59d4e-7875-4b75-a093-97a0b4e7239b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-39f59d4e-7875-4b75-a093-97a0b4e7239b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-dfcc4bc3-3276-408a-a945-e132d4fbf2e5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-dfcc4bc3-3276-408a-a945-e132d4fbf2e5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-e6be4fe8-bb46-418f-bd08-dba996ef250c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-e6be4fe8-bb46-418f-bd08-dba996ef250c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-d9de8255-dcbc-409d-b311-b7824a3ddeb6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-d9de8255-dcbc-409d-b311-b7824a3ddeb6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-9904f18c-def2-4249-b64c-956a2d12f2bd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-9904f18c-def2-4249-b64c-956a2d12f2bd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/repos_github-api_github-api_issues_311_reactions-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/user-d9a254e0-d5e1-4fd9-b995-51e933b769f3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/user-d9a254e0-d5e1-4fd9-b995-51e933b769f3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220302-6-b59615.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220302-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220302-6-b59615.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220302-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220303-13-cf170d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220303-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220303-13-cf170d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220303-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220305-14-dcbdbe.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220305-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220305-14-dcbdbe.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220305-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220306-15-08b50a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220306-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220306-15-08b50a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220306-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220307-16-12cbca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220307-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220307-16-12cbca.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/reactions_63220307-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2-66f6b3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2-66f6b3.json
deleted file mode 100644
index 1f25f068ca..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2-66f6b3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "66f6b3ba-129b-441c-9f2f-c9e18c941eea",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-66f6b3ba-129b-441c-9f2f-c9e18c941eea.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4891",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"269c8989f92f77931309a63cbad7a7c7\"",
-      "Last-Modified": "Sun, 23 Feb 2020 02:42:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68DF4:C0D653:5E51EE69"
-    }
-  },
-  "uuid": "66f6b3ba-129b-441c-9f2f-c9e18c941eea",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..6993e61bd2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "66f6b3ba-129b-441c-9f2f-c9e18c941eea",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4891",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"269c8989f92f77931309a63cbad7a7c7\"",
+      "Last-Modified": "Sun, 23 Feb 2020 02:42:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68DF4:C0D653:5E51EE69"
+    }
+  },
+  "uuid": "66f6b3ba-129b-441c-9f2f-c9e18c941eea",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3-1e8e21.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3-1e8e21.json
deleted file mode 100644
index 19485a5d1e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3-1e8e21.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1e8e21ad-edaf-4647-b812-4046b8f71a3a",
-  "name": "repos_github-api_github-api_issues_311",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_311-1e8e21ad-edaf-4647-b812-4046b8f71a3a.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4890",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"62f7fd95abf580737a40918dc382d828\"",
-      "Last-Modified": "Mon, 17 Feb 2020 11:11:11 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E02:C0D68F:5E51EE6A"
-    }
-  },
-  "uuid": "1e8e21ad-edaf-4647-b812-4046b8f71a3a",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3.json
new file mode 100644
index 0000000000..5af040474e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "1e8e21ad-edaf-4647-b812-4046b8f71a3a",
+  "name": "repos_github-api_github-api_issues_311",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_311-3.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4890",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"62f7fd95abf580737a40918dc382d828\"",
+      "Last-Modified": "Mon, 17 Feb 2020 11:11:11 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E02:C0D68F:5E51EE6A"
+    }
+  },
+  "uuid": "1e8e21ad-edaf-4647-b812-4046b8f71a3a",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10-1a3642.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10-1a3642.json
deleted file mode 100644
index e00fa54869..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10-1a3642.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "1a36428c-ce04-4580-b160-ffc42b4629ff",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"content\":\"eyes\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-1a36428c-ce04-4580-b160-ffc42b4629ff.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4883",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"7b229544c753e8c32911036296d1b2eb\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E6C:C0D703:5E51EE6C"
-    }
-  },
-  "uuid": "1a36428c-ce04-4580-b160-ffc42b4629ff",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10.json
new file mode 100644
index 0000000000..d58f13146e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-10.json
@@ -0,0 +1,54 @@
+{
+  "id": "1a36428c-ce04-4580-b160-ffc42b4629ff",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"content\":\"eyes\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-10.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4883",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "\"7b229544c753e8c32911036296d1b2eb\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E6C:C0D703:5E51EE6C"
+    }
+  },
+  "uuid": "1a36428c-ce04-4580-b160-ffc42b4629ff",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11-41bca5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11-41bca5.json
deleted file mode 100644
index 5a7a73f9e0..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11-41bca5.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "41bca581-4ce9-4d1a-94ee-407bb996afc8",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"content\":\"rocket\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-41bca581-4ce9-4d1a-94ee-407bb996afc8.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4882",
-      "X-RateLimit-Reset": "1582428789",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"264de84eeb4bbbfd44ee646c90683d2d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E83:C0D71E:5E51EE6C"
-    }
-  },
-  "uuid": "41bca581-4ce9-4d1a-94ee-407bb996afc8",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11.json
new file mode 100644
index 0000000000..168ebb4fdf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-11.json
@@ -0,0 +1,54 @@
+{
+  "id": "41bca581-4ce9-4d1a-94ee-407bb996afc8",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"content\":\"rocket\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-11.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4882",
+      "X-RateLimit-Reset": "1582428789",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "\"264de84eeb4bbbfd44ee646c90683d2d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E83:C0D71E:5E51EE6C"
+    }
+  },
+  "uuid": "41bca581-4ce9-4d1a-94ee-407bb996afc8",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12-ec5b45.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12-ec5b45.json
deleted file mode 100644
index 271cc1f280..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12-ec5b45.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ec5b4512-28c1-46fe-95d2-710c6da55cb3",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-ec5b4512-28c1-46fe-95d2-710c6da55cb3.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4881",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"e7f76146c68532e9ccff19c1a86daf0a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E9B:C0D731:5E51EE6D"
-    }
-  },
-  "uuid": "ec5b4512-28c1-46fe-95d2-710c6da55cb3",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
-  "requiredScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-3",
-  "newScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-4",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12.json
new file mode 100644
index 0000000000..9ff5cbdb52
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-12.json
@@ -0,0 +1,50 @@
+{
+  "id": "ec5b4512-28c1-46fe-95d2-710c6da55cb3",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-12.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4881",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"e7f76146c68532e9ccff19c1a86daf0a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E9B:C0D731:5E51EE6D"
+    }
+  },
+  "uuid": "ec5b4512-28c1-46fe-95d2-710c6da55cb3",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
+  "requiredScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-3",
+  "newScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-4",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17-e6be4f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17-e6be4f.json
deleted file mode 100644
index db89163b85..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17-e6be4f.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "e6be4fe8-bb46-418f-bd08-dba996ef250c",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-e6be4fe8-bb46-418f-bd08-dba996ef250c.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4876",
-      "X-RateLimit-Reset": "1582428789",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"17896e19dfa86d3946ff4a8c47200920\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68F04:C0D7BB:5E51EE6E"
-    }
-  },
-  "uuid": "e6be4fe8-bb46-418f-bd08-dba996ef250c",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
-  "requiredScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-4",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17.json
new file mode 100644
index 0000000000..455b47fd43
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-17.json
@@ -0,0 +1,49 @@
+{
+  "id": "e6be4fe8-bb46-418f-bd08-dba996ef250c",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-17.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4876",
+      "X-RateLimit-Reset": "1582428789",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"17896e19dfa86d3946ff4a8c47200920\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68F04:C0D7BB:5E51EE6E"
+    }
+  },
+  "uuid": "e6be4fe8-bb46-418f-bd08-dba996ef250c",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
+  "requiredScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-4",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4-a94639.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4-a94639.json
deleted file mode 100644
index 7512de8199..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4-a94639.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4889",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"17896e19dfa86d3946ff4a8c47200920\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E0B:C0D69D:5E51EE6A"
-    }
-  },
-  "uuid": "a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4.json
new file mode 100644
index 0000000000..8a5e051aac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-4.json
@@ -0,0 +1,50 @@
+{
+  "id": "a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-4.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4889",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"17896e19dfa86d3946ff4a8c47200920\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E0B:C0D69D:5E51EE6A"
+    }
+  },
+  "uuid": "a94639e7-cb76-4ea2-a6a2-8d9a5642f3ec",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5-dfcc4b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5-dfcc4b.json
deleted file mode 100644
index 4f8885a4f1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5-dfcc4b.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "dfcc4bc3-3276-408a-a945-e132d4fbf2e5",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"content\":\"hooray\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-dfcc4bc3-3276-408a-a945-e132d4fbf2e5.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4888",
-      "X-RateLimit-Reset": "1582428789",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"cdc7e73cd4d47876aae737d967949ff5\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E18:C0D6AF:5E51EE6A"
-    }
-  },
-  "uuid": "dfcc4bc3-3276-408a-a945-e132d4fbf2e5",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5.json
new file mode 100644
index 0000000000..27ef3d5cd4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "dfcc4bc3-3276-408a-a945-e132d4fbf2e5",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"content\":\"hooray\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-5.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4888",
+      "X-RateLimit-Reset": "1582428789",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "\"cdc7e73cd4d47876aae737d967949ff5\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E18:C0D6AF:5E51EE6A"
+    }
+  },
+  "uuid": "dfcc4bc3-3276-408a-a945-e132d4fbf2e5",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7-39f59d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7-39f59d.json
deleted file mode 100644
index d291928c21..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7-39f59d.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "39f59d4e-7875-4b75-a093-97a0b4e7239b",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-39f59d4e-7875-4b75-a093-97a0b4e7239b.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4886",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"17896e19dfa86d3946ff4a8c47200920\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E33:C0D6CD:5E51EE6B"
-    }
-  },
-  "uuid": "39f59d4e-7875-4b75-a093-97a0b4e7239b",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
-  "requiredScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-2",
-  "newScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-3",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7.json
new file mode 100644
index 0000000000..863fff45d6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "39f59d4e-7875-4b75-a093-97a0b4e7239b",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-7.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4886",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"17896e19dfa86d3946ff4a8c47200920\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E33:C0D6CD:5E51EE6B"
+    }
+  },
+  "uuid": "39f59d4e-7875-4b75-a093-97a0b4e7239b",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-issues-311-reactions",
+  "requiredScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-2",
+  "newScenarioState": "scenario-1-repos-github-api-github-api-issues-311-reactions-3",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8-d9de82.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8-d9de82.json
deleted file mode 100644
index 1bc824d3f6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8-d9de82.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "d9de8255-dcbc-409d-b311-b7824a3ddeb6",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"content\":\"+1\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-d9de8255-dcbc-409d-b311-b7824a3ddeb6.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4885",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"6830982bf9c6904a3f72d80ecc83fbaa\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E43:C0D6DC:5E51EE6B"
-    }
-  },
-  "uuid": "d9de8255-dcbc-409d-b311-b7824a3ddeb6",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8.json
new file mode 100644
index 0000000000..6f54fa88a3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-8.json
@@ -0,0 +1,54 @@
+{
+  "id": "d9de8255-dcbc-409d-b311-b7824a3ddeb6",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"content\":\"+1\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-8.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4885",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "\"6830982bf9c6904a3f72d80ecc83fbaa\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E43:C0D6DC:5E51EE6B"
+    }
+  },
+  "uuid": "d9de8255-dcbc-409d-b311-b7824a3ddeb6",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9-9904f1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9-9904f1.json
deleted file mode 100644
index 0eef3987e8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9-9904f1.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "9904f18c-def2-4249-b64c-956a2d12f2bd",
-  "name": "repos_github-api_github-api_issues_311_reactions",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/311/reactions",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"content\":\"confused\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-9904f18c-def2-4249-b64c-956a2d12f2bd.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4884",
-      "X-RateLimit-Reset": "1582428789",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"dd432412a55d48e08377920b04f443c5\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68E5A:C0D6EE:5E51EE6B"
-    }
-  },
-  "uuid": "9904f18c-def2-4249-b64c-956a2d12f2bd",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9.json
new file mode 100644
index 0000000000..8d42f51eeb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/repos_github-api_github-api_issues_311_reactions-9.json
@@ -0,0 +1,54 @@
+{
+  "id": "9904f18c-def2-4249-b64c-956a2d12f2bd",
+  "name": "repos_github-api_github-api_issues_311_reactions",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/311/reactions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.squirrel-girl-preview+json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"content\":\"confused\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api_github-api_issues_311_reactions-9.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4884",
+      "X-RateLimit-Reset": "1582428789",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "\"dd432412a55d48e08377920b04f443c5\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.squirrel-girl-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68E5A:C0D6EE:5E51EE6B"
+    }
+  },
+  "uuid": "9904f18c-def2-4249-b64c-956a2d12f2bd",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1-d9a254.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1-d9a254.json
deleted file mode 100644
index ae8e42e37e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1-d9a254.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d9a254e0-d5e1-4fd9-b995-51e933b769f3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d9a254e0-d5e1-4fd9-b995-51e933b769f3.json",
-    "headers": {
-      "Date": "Sun, 23 Feb 2020 03:15:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4893",
-      "X-RateLimit-Reset": "1582428788",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C701:8993:A68DC2:C0D644:5E51EE69"
-    }
-  },
-  "uuid": "d9a254e0-d5e1-4fd9-b995-51e933b769f3",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1.json
new file mode 100644
index 0000000000..5476bd4824
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/reactions/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d9a254e0-d5e1-4fd9-b995-51e933b769f3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 23 Feb 2020 03:15:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4893",
+      "X-RateLimit-Reset": "1582428788",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C701:8993:A68DC2:C0D644:5E51EE69"
+    }
+  },
+  "uuid": "d9a254e0-d5e1-4fd9-b995-51e933b769f3",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/orgs_jenkinsci-0d9fbee0-4b68-47c0-a981-105ca1998d9a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/orgs_jenkinsci-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/orgs_jenkinsci-0d9fbee0-4b68-47c0-a981-105ca1998d9a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/orgs_jenkinsci-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/user-1f8ee76d-944b-4d35-953f-e99ef59186eb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/user-1f8ee76d-944b-4d35-953f-e99ef59186eb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_b-6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_b-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_b-6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_b-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_kohsuke-6fc7a54e-d15d-4275-a7aa-396937282c09.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_kohsuke-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_kohsuke-6fc7a54e-d15d-4275-a7aa-396937282c09.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/__files/users_kohsuke-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2-0d9fbe.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2-0d9fbe.json
deleted file mode 100644
index 6ca6974899..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2-0d9fbe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0d9fbee0-4b68-47c0-a981-105ca1998d9a",
-  "name": "orgs_jenkinsci",
-  "request": {
-    "url": "/orgs/jenkinsci",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci-0d9fbee0-4b68-47c0-a981-105ca1998d9a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4387",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ee1dcb6549b6c8fc14267ae3abde8f38\"",
-      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC0:833C:55B6CA:63EEAF:5DB3A114"
-    }
-  },
-  "uuid": "0d9fbee0-4b68-47c0-a981-105ca1998d9a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2.json
new file mode 100644
index 0000000000..a7e79d30ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "0d9fbee0-4b68-47c0-a981-105ca1998d9a",
+  "name": "orgs_jenkinsci",
+  "request": {
+    "url": "/orgs/jenkinsci",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4387",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ee1dcb6549b6c8fc14267ae3abde8f38\"",
+      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC0:833C:55B6CA:63EEAF:5DB3A114"
+    }
+  },
+  "uuid": "0d9fbee0-4b68-47c0-a981-105ca1998d9a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_b-6-ee4228.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_b-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_b-6-ee4228.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_b-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_kohsuke-5-073028.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_kohsuke-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_kohsuke-5-073028.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_members_kohsuke-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_b-8-fde843.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_b-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_b-8-fde843.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_b-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_kohsuke-7-0da2da.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_kohsuke-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_kohsuke-7-0da2da.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/orgs_jenkinsci_public_members_kohsuke-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1-1f8ee7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1-1f8ee7.json
deleted file mode 100644
index 5a5f80452b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1-1f8ee7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1f8ee76d-944b-4d35-953f-e99ef59186eb",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1f8ee76d-944b-4d35-953f-e99ef59186eb.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4389",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC0:833C:55B6BB:63EEA5:5DB3A114"
-    }
-  },
-  "uuid": "1f8ee76d-944b-4d35-953f-e99ef59186eb",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1.json
new file mode 100644
index 0000000000..f85d75da41
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1f8ee76d-944b-4d35-953f-e99ef59186eb",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4389",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC0:833C:55B6BB:63EEA5:5DB3A114"
+    }
+  },
+  "uuid": "1f8ee76d-944b-4d35-953f-e99ef59186eb",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4-6d6a6b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4-6d6a6b.json
deleted file mode 100644
index 107569cd1c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4-6d6a6b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50",
-  "name": "users_b",
-  "request": {
-    "url": "/users/b",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_b-6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4385",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"46c396489784f79825366890a95394ee\"",
-      "Last-Modified": "Wed, 28 Aug 2019 17:35:04 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC0:833C:55B6E1:63EECC:5DB3A115"
-    }
-  },
-  "uuid": "6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4.json
new file mode 100644
index 0000000000..57dea7226b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_b-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50",
+  "name": "users_b",
+  "request": {
+    "url": "/users/b",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_b-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4385",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"46c396489784f79825366890a95394ee\"",
+      "Last-Modified": "Wed, 28 Aug 2019 17:35:04 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC0:833C:55B6E1:63EECC:5DB3A115"
+    }
+  },
+  "uuid": "6d6a6b03-f90a-47f7-b0ad-b80aab3b0a50",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3-6fc7a5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3-6fc7a5.json
deleted file mode 100644
index 9108382281..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3-6fc7a5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6fc7a54e-d15d-4275-a7aa-396937282c09",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-6fc7a54e-d15d-4275-a7aa-396937282c09.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4386",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
-      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC0:833C:55B6DB:63EEC7:5DB3A115"
-    }
-  },
-  "uuid": "6fc7a54e-d15d-4275-a7aa-396937282c09",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3.json
new file mode 100644
index 0000000000..7dc1b146cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCheckMembership/mappings/users_kohsuke-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6fc7a54e-d15d-4275-a7aa-396937282c09",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4386",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
+      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC0:833C:55B6DB:63EEC7:5DB3A115"
+    }
+  },
+  "uuid": "6fc7a54e-d15d-4275-a7aa-396937282c09",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins-f502af71-7b74-4106-a246-1728b2c761ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins-f502af71-7b74-4106-a246-1728b2c761ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-c46f8ba9-3382-4afd-95b4-5efe98749e1d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-c46f8ba9-3382-4afd-95b4-5efe98749e1d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-8ff72064-9c69-42c5-b00f-8fd6d21af7f7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-8ff72064-9c69-42c5-b00f-8fd6d21af7f7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-ba22502f-be39-4226-bf77-729b8fe2351a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-ba22502f-be39-4226-bf77-729b8fe2351a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-d30d6520-52dd-4f0c-9254-59fcdd4eeb86.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-d30d6520-52dd-4f0c-9254-59fcdd4eeb86.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/user-bddf3899-0de4-49c5-af35-56e5b63ef972.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/user-bddf3899-0de4-49c5-af35-56e5b63ef972.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/users_jenkinsci-0eb97309-f0ae-460d-9fbe-f091372110eb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/users_jenkinsci-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/users_jenkinsci-0eb97309-f0ae-460d-9fbe-f091372110eb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/__files/users_jenkinsci-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3-f502af.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3-f502af.json
deleted file mode 100644
index 37d90e6868..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3-f502af.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f502af71-7b74-4106-a246-1728b2c761ec",
-  "name": "repos_jenkinsci_jenkins",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins-f502af71-7b74-4106-a246-1728b2c761ec.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4288",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A23FD:1EF37A:5DB3A149"
-    }
-  },
-  "uuid": "f502af71-7b74-4106-a246-1728b2c761ec",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3.json
new file mode 100644
index 0000000000..510c13b118
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "f502af71-7b74-4106-a246-1728b2c761ec",
+  "name": "repos_jenkinsci_jenkins",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4288",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A23FD:1EF37A:5DB3A149"
+    }
+  },
+  "uuid": "f502af71-7b74-4106-a246-1728b2c761ec",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4-c46f8b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4-c46f8b.json
deleted file mode 100644
index 270fbfe639..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4-c46f8b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c46f8ba9-3382-4afd-95b4-5efe98749e1d",
-  "name": "repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/commits/08c1c9970af4d609ae754fbe803e06186e3206f7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-c46f8ba9-3382-4afd-95b4-5efe98749e1d.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4287",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cc8e7993a42bab15efbff39d175d0b10\"",
-      "Last-Modified": "Tue, 24 Apr 2012 00:16:52 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A2400:1EF37E:5DB3A14A"
-    }
-  },
-  "uuid": "c46f8ba9-3382-4afd-95b4-5efe98749e1d",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json
new file mode 100644
index 0000000000..4b95bd7386
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "c46f8ba9-3382-4afd-95b4-5efe98749e1d",
+  "name": "repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/commits/08c1c9970af4d609ae754fbe803e06186e3206f7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_commits_08c1c9970af4d609ae754fbe803e06186e3206f7-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4287",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cc8e7993a42bab15efbff39d175d0b10\"",
+      "Last-Modified": "Tue, 24 Apr 2012 00:16:52 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A2400:1EF37E:5DB3A14A"
+    }
+  },
+  "uuid": "c46f8ba9-3382-4afd-95b4-5efe98749e1d",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5-8ff720.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5-8ff720.json
deleted file mode 100644
index 37520f112c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5-8ff720.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8ff72064-9c69-42c5-b00f-8fd6d21af7f7",
-  "name": "repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/commits/e5463e3d53fdf74e917d63dc44ec60bab60a24d4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-8ff72064-9c69-42c5-b00f-8fd6d21af7f7.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4286",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"96de82f912d65c05b4e1f392051a6c2a\"",
-      "Last-Modified": "Mon, 23 Apr 2012 22:32:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A2403:1EF383:5DB3A14A"
-    }
-  },
-  "uuid": "8ff72064-9c69-42c5-b00f-8fd6d21af7f7",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json
new file mode 100644
index 0000000000..3ed6d886f3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "8ff72064-9c69-42c5-b00f-8fd6d21af7f7",
+  "name": "repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/commits/e5463e3d53fdf74e917d63dc44ec60bab60a24d4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_commits_e5463e3d53fdf74e917d63dc44ec60bab60a24d4-5.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4286",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"96de82f912d65c05b4e1f392051a6c2a\"",
+      "Last-Modified": "Mon, 23 Apr 2012 22:32:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A2403:1EF383:5DB3A14A"
+    }
+  },
+  "uuid": "8ff72064-9c69-42c5-b00f-8fd6d21af7f7",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_blobs_187cdf651cbf44196886f87327dc3968443174fb-7-176ac3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_blobs_187cdf651cbf44196886f87327dc3968443174fb-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_blobs_187cdf651cbf44196886f87327dc3968443174fb-7-176ac3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_blobs_187cdf651cbf44196886f87327dc3968443174fb-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8-ba2250.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8-ba2250.json
deleted file mode 100644
index 97c362dc33..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8-ba2250.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ba22502f-be39-4226-bf77-729b8fe2351a",
-  "name": "repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/git/trees/216d657eb6b24cb3ee300cf9dfe97b4131b7800b",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-ba22502f-be39-4226-bf77-729b8fe2351a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4283",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6d19930d413337f528ff26d8701d7faf\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A240D:1EF38D:5DB3A14A"
-    }
-  },
-  "uuid": "ba22502f-be39-4226-bf77-729b8fe2351a",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json
new file mode 100644
index 0000000000..44b652c79b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "ba22502f-be39-4226-bf77-729b8fe2351a",
+  "name": "repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/git/trees/216d657eb6b24cb3ee300cf9dfe97b4131b7800b",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_git_trees_216d657eb6b24cb3ee300cf9dfe97b4131b7800b-8.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4283",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6d19930d413337f528ff26d8701d7faf\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A240D:1EF38D:5DB3A14A"
+    }
+  },
+  "uuid": "ba22502f-be39-4226-bf77-729b8fe2351a",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6-d30d65.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6-d30d65.json
deleted file mode 100644
index 6e0866ecf6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6-d30d65.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d30d6520-52dd-4f0c-9254-59fcdd4eeb86",
-  "name": "repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/git/trees/d96a6e8b7231571b49af150a683177f37a180f04",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-d30d6520-52dd-4f0c-9254-59fcdd4eeb86.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4285",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f58ef0149d3b35957c18ea74df832bda\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A2408:1EF387:5DB3A14A"
-    }
-  },
-  "uuid": "d30d6520-52dd-4f0c-9254-59fcdd4eeb86",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json
new file mode 100644
index 0000000000..cd899c5ba8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "d30d6520-52dd-4f0c-9254-59fcdd4eeb86",
+  "name": "repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/git/trees/d96a6e8b7231571b49af150a683177f37a180f04",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_git_trees_d96a6e8b7231571b49af150a683177f37a180f04-6.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4285",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f58ef0149d3b35957c18ea74df832bda\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A2408:1EF387:5DB3A14A"
+    }
+  },
+  "uuid": "d30d6520-52dd-4f0c-9254-59fcdd4eeb86",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1-bddf38.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1-bddf38.json
deleted file mode 100644
index 702bb8a1fc..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1-bddf38.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bddf3899-0de4-49c5-af35-56e5b63ef972",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-bddf3899-0de4-49c5-af35-56e5b63ef972.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4291",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A23F6:1EF373:5DB3A149"
-    }
-  },
-  "uuid": "bddf3899-0de4-49c5-af35-56e5b63ef972",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1.json
new file mode 100644
index 0000000000..c1a1408277
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "bddf3899-0de4-49c5-af35-56e5b63ef972",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4291",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A23F6:1EF373:5DB3A149"
+    }
+  },
+  "uuid": "bddf3899-0de4-49c5-af35-56e5b63ef972",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2-0eb973.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2-0eb973.json
deleted file mode 100644
index 13096940c5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2-0eb973.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0eb97309-f0ae-460d-9fbe-f091372110eb",
-  "name": "users_jenkinsci",
-  "request": {
-    "url": "/users/jenkinsci",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_jenkinsci-0eb97309-f0ae-460d-9fbe-f091372110eb.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4289",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf08d94b8454daf0770638531436c38e\"",
-      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB0D:1CC2:1A23FB:1EF375:5DB3A149"
-    }
-  },
-  "uuid": "0eb97309-f0ae-460d-9fbe-f091372110eb",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2.json
new file mode 100644
index 0000000000..a4e02456e1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommit/mappings/users_jenkinsci-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "0eb97309-f0ae-460d-9fbe-f091372110eb",
+  "name": "users_jenkinsci",
+  "request": {
+    "url": "/users/jenkinsci",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_jenkinsci-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4289",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf08d94b8454daf0770638531436c38e\"",
+      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB0D:1CC2:1A23FB:1EF375:5DB3A149"
+    }
+  },
+  "uuid": "0eb97309-f0ae-460d-9fbe-f091372110eb",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins-fe185aa7-c9e7-44d3-86e9-fd751abcf0d7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins-fe185aa7-c9e7-44d3-86e9-fd751abcf0d7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins_comments-c4ee8bf9-1fc1-4535-ac30-f4133283e22f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins_comments-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins_comments-c4ee8bf9-1fc1-4535-ac30-f4133283e22f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/repos_jenkinsci_jenkins_comments-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/user-b9ac0eab-6dd1-4c7a-84fa-bf39e150869d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/user-b9ac0eab-6dd1-4c7a-84fa-bf39e150869d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/users_jenkinsci-2443ea59-c39e-4dbc-8e5d-4f0330abb3dd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/users_jenkinsci-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/users_jenkinsci-2443ea59-c39e-4dbc-8e5d-4f0330abb3dd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/__files/users_jenkinsci-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3-fe185a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3-fe185a.json
deleted file mode 100644
index 5248b1dd1d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3-fe185a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fe185aa7-c9e7-44d3-86e9-fd751abcf0d7",
-  "name": "repos_jenkinsci_jenkins",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins-fe185aa7-c9e7-44d3-86e9-fd751abcf0d7.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4391",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CABC:98FD:56009A:651EBA:5DB3A113"
-    }
-  },
-  "uuid": "fe185aa7-c9e7-44d3-86e9-fd751abcf0d7",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3.json
new file mode 100644
index 0000000000..33261d2432
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "fe185aa7-c9e7-44d3-86e9-fd751abcf0d7",
+  "name": "repos_jenkinsci_jenkins",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4391",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CABC:98FD:56009A:651EBA:5DB3A113"
+    }
+  },
+  "uuid": "fe185aa7-c9e7-44d3-86e9-fd751abcf0d7",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4-c4ee8b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4-c4ee8b.json
deleted file mode 100644
index aaf51ccefe..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4-c4ee8b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c4ee8bf9-1fc1-4535-ac30-f4133283e22f",
-  "name": "repos_jenkinsci_jenkins_comments",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_comments-c4ee8bf9-1fc1-4535-ac30-f4133283e22f.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4390",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"06f06aa168061deee509547275821e75\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CABC:98FD:5600A0:651EC2:5DB3A113",
-      "Link": "<https://api.github.com/repositories/1103607/comments?page=2>; rel=\"next\", <https://api.github.com/repositories/1103607/comments?page=52>; rel=\"last\""
-    }
-  },
-  "uuid": "c4ee8bf9-1fc1-4535-ac30-f4133283e22f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4.json
new file mode 100644
index 0000000000..b548ed0438
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/repos_jenkinsci_jenkins_comments-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "c4ee8bf9-1fc1-4535-ac30-f4133283e22f",
+  "name": "repos_jenkinsci_jenkins_comments",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_comments-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4390",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"06f06aa168061deee509547275821e75\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CABC:98FD:5600A0:651EC2:5DB3A113",
+      "Link": "<https://api.github.com/repositories/1103607/comments?page=2>; rel=\"next\", <https://api.github.com/repositories/1103607/comments?page=52>; rel=\"last\""
+    }
+  },
+  "uuid": "c4ee8bf9-1fc1-4535-ac30-f4133283e22f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1-b9ac0e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1-b9ac0e.json
deleted file mode 100644
index 688ccaf324..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1-b9ac0e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b9ac0eab-6dd1-4c7a-84fa-bf39e150869d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b9ac0eab-6dd1-4c7a-84fa-bf39e150869d.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4394",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CABC:98FD:56008B:651EAA:5DB3A112"
-    }
-  },
-  "uuid": "b9ac0eab-6dd1-4c7a-84fa-bf39e150869d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1.json
new file mode 100644
index 0000000000..80973cba68
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b9ac0eab-6dd1-4c7a-84fa-bf39e150869d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4394",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CABC:98FD:56008B:651EAA:5DB3A112"
+    }
+  },
+  "uuid": "b9ac0eab-6dd1-4c7a-84fa-bf39e150869d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2-2443ea.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2-2443ea.json
deleted file mode 100644
index 1f47e36efa..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2-2443ea.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2443ea59-c39e-4dbc-8e5d-4f0330abb3dd",
-  "name": "users_jenkinsci",
-  "request": {
-    "url": "/users/jenkinsci",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_jenkinsci-2443ea59-c39e-4dbc-8e5d-4f0330abb3dd.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4392",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf08d94b8454daf0770638531436c38e\"",
-      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CABC:98FD:560097:651EB0:5DB3A113"
-    }
-  },
-  "uuid": "2443ea59-c39e-4dbc-8e5d-4f0330abb3dd",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2.json
new file mode 100644
index 0000000000..848edbbba4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitComment/mappings/users_jenkinsci-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "2443ea59-c39e-4dbc-8e5d-4f0330abb3dd",
+  "name": "users_jenkinsci",
+  "request": {
+    "url": "/users/jenkinsci",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_jenkinsci-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4392",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf08d94b8454daf0770638531436c38e\"",
+      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CABC:98FD:560097:651EB0:5DB3A113"
+    }
+  },
+  "uuid": "2443ea59-c39e-4dbc-8e5d-4f0330abb3dd",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-016aa7d1-f62e-49e2-9be0-34111d49b832.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-016aa7d1-f62e-49e2-9be0-34111d49b832.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-061d63fb-a9bd-4d26-836d-9261dd42930d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-061d63fb-a9bd-4d26-836d-9261dd42930d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-0b1ed97e-e317-43be-848e-3710f427cc76.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-0b1ed97e-e317-43be-848e-3710f427cc76.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-11236d5f-f9ac-46bc-8df5-74a3c0530d01.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-11236d5f-f9ac-46bc-8df5-74a3c0530d01.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-1772651c-10b1-4cf8-9ed1-84ff1ab391be.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-1772651c-10b1-4cf8-9ed1-84ff1ab391be.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-1c2b0dc9-c393-4356-93ed-0dbf29eaa073.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-1c2b0dc9-c393-4356-93ed-0dbf29eaa073.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-1dc4cd7d-3dda-4b61-881d-53f0f9f396da.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-1dc4cd7d-3dda-4b61-881d-53f0f9f396da.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-2449929f-f645-478c-a200-84c46cd27f6a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-2449929f-f645-478c-a200-84c46cd27f6a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-25933563-afb5-46c5-86d8-40bcd4afdc54.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-25933563-afb5-46c5-86d8-40bcd4afdc54.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-288d443b-fb97-49a0-85ec-b384c81e5c29.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-288d443b-fb97-49a0-85ec-b384c81e5c29.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-20.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-2b956666-2508-4e00-ad10-91f6f465d3b6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-2b956666-2508-4e00-ad10-91f6f465d3b6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-21.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-22.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-39b4cc7b-9408-4469-94b3-91dcc8adf81b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-39b4cc7b-9408-4469-94b3-91dcc8adf81b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-23.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-3c19ad8d-5e22-48d0-9622-b89de17225a5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-3c19ad8d-5e22-48d0-9622-b89de17225a5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-24.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-3da25c77-0a96-46f4-b48c-ca514e84349e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-25.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-3da25c77-0a96-46f4-b48c-ca514e84349e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-25.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-46e796bd-5015-48c3-9b4b-954a846a5aa3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-26.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-46e796bd-5015-48c3-9b4b-954a846a5aa3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-26.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-480308a6-e401-4c55-9963-107907d3ac39.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-27.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-480308a6-e401-4c55-9963-107907d3ac39.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-27.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-50679dd0-df4e-432b-85fa-bc3f72980bb3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-28.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-50679dd0-df4e-432b-85fa-bc3f72980bb3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-28.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5765a28a-f754-4986-be30-e9016247083c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-29.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5765a28a-f754-4986-be30-e9016247083c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-29.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-59105db7-b5a8-452b-9530-6d1828515426.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-59105db7-b5a8-452b-9530-6d1828515426.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-598ba839-d205-49d9-a035-ef234f6664a2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-30.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-598ba839-d205-49d9-a035-ef234f6664a2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-30.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5f2792cf-918e-4737-bc45-c253be138496.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-31.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5f2792cf-918e-4737-bc45-c253be138496.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-31.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5f4c645c-c4ea-4d46-afd6-2bab121b6a19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-32.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5f4c645c-c4ea-4d46-afd6-2bab121b6a19.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-32.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-68d3a2e3-9145-47b2-bdf4-7bd97aa73888.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-34.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-68d3a2e3-9145-47b2-bdf4-7bd97aa73888.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-34.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-68f868af-ba3c-4215-a7a8-b1270cbbce4f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-35.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-68f868af-ba3c-4215-a7a8-b1270cbbce4f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-35.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-69de9951-24b6-4611-a4ee-59ba945a3f40.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-36.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-69de9951-24b6-4611-a4ee-59ba945a3f40.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-36.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-70bc8011-2466-4bba-97f7-abd03bbc5ba3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-37.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-70bc8011-2466-4bba-97f7-abd03bbc5ba3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-37.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-738e2f15-638d-4242-8662-c0416946339c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-38.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-738e2f15-638d-4242-8662-c0416946339c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-38.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-7d831041-a17e-4591-b3e9-98e66530cdf9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-39.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-7d831041-a17e-4591-b3e9-98e66530cdf9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-39.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-7d942646-69e0-4427-a560-971b1acaa32d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-7d942646-69e0-4427-a560-971b1acaa32d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-89902ceb-d28f-4282-887b-5a9b163f3c7f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-40.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-89902ceb-d28f-4282-887b-5a9b163f3c7f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-40.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-8dd6b062-3e66-4047-9dff-989e7f229f29.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-41.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-8dd6b062-3e66-4047-9dff-989e7f229f29.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-41.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-8eeab8d2-aad7-42a5-a940-b57cab9fe3ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-42.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-8eeab8d2-aad7-42a5-a940-b57cab9fe3ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-42.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-918f6018-f314-4a29-8cab-29ff0eb56771.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-43.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-918f6018-f314-4a29-8cab-29ff0eb56771.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-43.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-91a31faf-a765-4032-9ab2-572dc9c75442.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-44.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-91a31faf-a765-4032-9ab2-572dc9c75442.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-44.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-93f9887a-c450-44be-8e98-1abec0784450.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-45.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-93f9887a-c450-44be-8e98-1abec0784450.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-45.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-9aecf306-8cc6-4b59-8d59-ef635dde8692.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-46.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-9aecf306-8cc6-4b59-8d59-ef635dde8692.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-46.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a11d115c-2e43-4565-8097-e504023c904b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-47.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a11d115c-2e43-4565-8097-e504023c904b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-47.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a1c9b077-4fda-48b7-892f-87952aac7a53.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-48.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a1c9b077-4fda-48b7-892f-87952aac7a53.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-48.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a217bdca-af93-42db-9189-440c435acdb0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-49.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a217bdca-af93-42db-9189-440c435acdb0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-49.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c300b8a5-ba5f-4c83-9a48-fb12a355f23e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-50.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c300b8a5-ba5f-4c83-9a48-fb12a355f23e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-50.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c363dc3e-d01d-40ee-8858-6df8433e4697.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-51.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c363dc3e-d01d-40ee-8858-6df8433e4697.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-51.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c4fbb565-2111-4817-86f3-e5598f391a6c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-52.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c4fbb565-2111-4817-86f3-e5598f391a6c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-52.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c56228ec-bb80-431a-853d-2da082c0c524.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-53.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c56228ec-bb80-431a-853d-2da082c0c524.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-53.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c68776fa-2888-40be-b35d-7f5dc29de9c8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-54.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c68776fa-2888-40be-b35d-7f5dc29de9c8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-54.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c80963b9-e025-41c3-b58c-05e05b668635.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-55.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-c80963b9-e025-41c3-b58c-05e05b668635.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-55.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-ce3916ac-a5ba-4f3b-a28f-fbcb451822df.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-56.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-ce3916ac-a5ba-4f3b-a28f-fbcb451822df.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-56.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d52fd23a-7f97-41db-8361-02119185c8cf.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-57.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d52fd23a-7f97-41db-8361-02119185c8cf.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-57.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d578ab70-40b9-48a1-8cd3-18d8e5b17a71.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-58.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d578ab70-40b9-48a1-8cd3-18d8e5b17a71.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-58.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d7c5093b-fde1-44e2-9c99-b951a1af1f8b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-59.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d7c5093b-fde1-44e2-9c99-b951a1af1f8b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-59.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d7fec78a-8d2f-49af-92f9-a647a90190ff.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-d7fec78a-8d2f-49af-92f9-a647a90190ff.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-db288d44-d417-4fcc-b1a6-4fa1d1fd0764.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-60.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-db288d44-d417-4fcc-b1a6-4fa1d1fd0764.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-60.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-dc6c74e4-526f-4707-b50e-42ad3933c40a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-61.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-dc6c74e4-526f-4707-b50e-42ad3933c40a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-61.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-df143360-27af-463f-9d79-8c257992e7a8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-62.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-df143360-27af-463f-9d79-8c257992e7a8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-62.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-e0294eea-1425-4dbf-82f7-44cf6ec78634.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-63.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-e0294eea-1425-4dbf-82f7-44cf6ec78634.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-63.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-f7ed8103-6fcb-4fc6-8fc8-3a2581841897.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-f7ed8103-6fcb-4fc6-8fc8-3a2581841897.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-fb9346a5-515a-441e-a3aa-900b89888fb1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-fb9346a5-515a-441e-a3aa-900b89888fb1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-fe73af36-08b9-4e1c-8aa5-77c6489f2e2c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-fe73af36-08b9-4e1c-8aa5-77c6489f2e2c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-5380cece-177e-4cf9-b842-8fcce67d9528.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-5380cece-177e-4cf9-b842-8fcce67d9528.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-44b5b3a8-cb76-4cd7-8b0f-762f81037dac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-44b5b3a8-cb76-4cd7-8b0f-762f81037dac.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-33.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/search_commits-33.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/user-726152f6-effe-47f0-b092-29d86ff46ef5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/user-726152f6-effe-47f0-b092-29d86ff46ef5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10-177265.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10-177265.json
deleted file mode 100644
index 68459cea54..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10-177265.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1772651c-10b1-4cf8-9ed1-84ff1ab391be",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-1772651c-10b1-4cf8-9ed1-84ff1ab391be.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4927",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB126:724A66:5E50909B"
-    }
-  },
-  "uuid": "1772651c-10b1-4cf8-9ed1-84ff1ab391be",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-8",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-9",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10.json
new file mode 100644
index 0000000000..02911a0ddc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-10.json
@@ -0,0 +1,51 @@
+{
+  "id": "1772651c-10b1-4cf8-9ed1-84ff1ab391be",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-10.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4927",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB126:724A66:5E50909B"
+    }
+  },
+  "uuid": "1772651c-10b1-4cf8-9ed1-84ff1ab391be",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-8",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-9",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11-480308.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11-480308.json
deleted file mode 100644
index e477f629be..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11-480308.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "480308a6-e401-4c55-9963-107907d3ac39",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-480308a6-e401-4c55-9963-107907d3ac39.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4926",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB12E:724A71:5E50909B"
-    }
-  },
-  "uuid": "480308a6-e401-4c55-9963-107907d3ac39",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-9",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-10",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11.json
new file mode 100644
index 0000000000..da51098329
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-11.json
@@ -0,0 +1,51 @@
+{
+  "id": "480308a6-e401-4c55-9963-107907d3ac39",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-11.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4926",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB12E:724A71:5E50909B"
+    }
+  },
+  "uuid": "480308a6-e401-4c55-9963-107907d3ac39",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-9",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-10",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12-39b4cc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12-39b4cc.json
deleted file mode 100644
index 59083783cc..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12-39b4cc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "39b4cc7b-9408-4469-94b3-91dcc8adf81b",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-39b4cc7b-9408-4469-94b3-91dcc8adf81b.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4925",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB135:724A78:5E50909B"
-    }
-  },
-  "uuid": "39b4cc7b-9408-4469-94b3-91dcc8adf81b",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-10",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-11",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12.json
new file mode 100644
index 0000000000..8fefb39164
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-12.json
@@ -0,0 +1,51 @@
+{
+  "id": "39b4cc7b-9408-4469-94b3-91dcc8adf81b",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-12.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4925",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB135:724A78:5E50909B"
+    }
+  },
+  "uuid": "39b4cc7b-9408-4469-94b3-91dcc8adf81b",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-10",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-11",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13-59105d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13-59105d.json
deleted file mode 100644
index 0458c3a861..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13-59105d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "59105db7-b5a8-452b-9530-6d1828515426",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-59105db7-b5a8-452b-9530-6d1828515426.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4924",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB13E:724A84:5E50909B"
-    }
-  },
-  "uuid": "59105db7-b5a8-452b-9530-6d1828515426",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-11",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-12",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13.json
new file mode 100644
index 0000000000..1e0e31ed45
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-13.json
@@ -0,0 +1,51 @@
+{
+  "id": "59105db7-b5a8-452b-9530-6d1828515426",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-13.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4924",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB13E:724A84:5E50909B"
+    }
+  },
+  "uuid": "59105db7-b5a8-452b-9530-6d1828515426",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-11",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-12",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14-a1c9b0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14-a1c9b0.json
deleted file mode 100644
index 1e17433024..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14-a1c9b0.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "a1c9b077-4fda-48b7-892f-87952aac7a53",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-a1c9b077-4fda-48b7-892f-87952aac7a53.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4923",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB144:724A89:5E50909C"
-    }
-  },
-  "uuid": "a1c9b077-4fda-48b7-892f-87952aac7a53",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-12",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-13",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14.json
new file mode 100644
index 0000000000..b3c1ee324b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-14.json
@@ -0,0 +1,51 @@
+{
+  "id": "a1c9b077-4fda-48b7-892f-87952aac7a53",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-14.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4923",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB144:724A89:5E50909C"
+    }
+  },
+  "uuid": "a1c9b077-4fda-48b7-892f-87952aac7a53",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-12",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-13",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15-918f60.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15-918f60.json
deleted file mode 100644
index b2d7792fa4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15-918f60.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "918f6018-f314-4a29-8cab-29ff0eb56771",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-918f6018-f314-4a29-8cab-29ff0eb56771.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB147:724A90:5E50909C"
-    }
-  },
-  "uuid": "918f6018-f314-4a29-8cab-29ff0eb56771",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-13",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-14",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15.json
new file mode 100644
index 0000000000..2dbcbb34a6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-15.json
@@ -0,0 +1,51 @@
+{
+  "id": "918f6018-f314-4a29-8cab-29ff0eb56771",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-15.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB147:724A90:5E50909C"
+    }
+  },
+  "uuid": "918f6018-f314-4a29-8cab-29ff0eb56771",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-13",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-14",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16-738e2f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16-738e2f.json
deleted file mode 100644
index 4f183a115e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16-738e2f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "738e2f15-638d-4242-8662-c0416946339c",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-738e2f15-638d-4242-8662-c0416946339c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4921",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB153:724A9B:5E50909C"
-    }
-  },
-  "uuid": "738e2f15-638d-4242-8662-c0416946339c",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-14",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-15",
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16.json
new file mode 100644
index 0000000000..996ca5419b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-16.json
@@ -0,0 +1,51 @@
+{
+  "id": "738e2f15-638d-4242-8662-c0416946339c",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-16.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4921",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB153:724A9B:5E50909C"
+    }
+  },
+  "uuid": "738e2f15-638d-4242-8662-c0416946339c",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-14",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-15",
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17-259335.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17-259335.json
deleted file mode 100644
index 0cc0f90c76..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17-259335.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "25933563-afb5-46c5-86d8-40bcd4afdc54",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-25933563-afb5-46c5-86d8-40bcd4afdc54.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4920",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB15D:724AA8:5E50909C"
-    }
-  },
-  "uuid": "25933563-afb5-46c5-86d8-40bcd4afdc54",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-15",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-16",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17.json
new file mode 100644
index 0000000000..ae61f225dc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-17.json
@@ -0,0 +1,51 @@
+{
+  "id": "25933563-afb5-46c5-86d8-40bcd4afdc54",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-17.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4920",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB15D:724AA8:5E50909C"
+    }
+  },
+  "uuid": "25933563-afb5-46c5-86d8-40bcd4afdc54",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-15",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-16",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18-9aecf3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18-9aecf3.json
deleted file mode 100644
index 2891baeaa1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18-9aecf3.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "9aecf306-8cc6-4b59-8d59-ef635dde8692",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-9aecf306-8cc6-4b59-8d59-ef635dde8692.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB165:724AB4:5E50909C"
-    }
-  },
-  "uuid": "9aecf306-8cc6-4b59-8d59-ef635dde8692",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-16",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-17",
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18.json
new file mode 100644
index 0000000000..bae3cf2184
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-18.json
@@ -0,0 +1,51 @@
+{
+  "id": "9aecf306-8cc6-4b59-8d59-ef635dde8692",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-18.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB165:724AB4:5E50909C"
+    }
+  },
+  "uuid": "9aecf306-8cc6-4b59-8d59-ef635dde8692",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-16",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-17",
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19-fb9346.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19-fb9346.json
deleted file mode 100644
index 96486026eb..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19-fb9346.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "fb9346a5-515a-441e-a3aa-900b89888fb1",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-fb9346a5-515a-441e-a3aa-900b89888fb1.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4918",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB16F:724ABD:5E50909C"
-    }
-  },
-  "uuid": "fb9346a5-515a-441e-a3aa-900b89888fb1",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-17",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-18",
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19.json
new file mode 100644
index 0000000000..050a335efa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-19.json
@@ -0,0 +1,51 @@
+{
+  "id": "fb9346a5-515a-441e-a3aa-900b89888fb1",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-19.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4918",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB16F:724ABD:5E50909C"
+    }
+  },
+  "uuid": "fb9346a5-515a-441e-a3aa-900b89888fb1",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-17",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-18",
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20-89902c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20-89902c.json
deleted file mode 100644
index fa2c4cf1b5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20-89902c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "89902ceb-d28f-4282-887b-5a9b163f3c7f",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-89902ceb-d28f-4282-887b-5a9b163f3c7f.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4917",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB176:724AC7:5E50909D"
-    }
-  },
-  "uuid": "89902ceb-d28f-4282-887b-5a9b163f3c7f",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-18",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-19",
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20.json
new file mode 100644
index 0000000000..2ea4944710
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-20.json
@@ -0,0 +1,51 @@
+{
+  "id": "89902ceb-d28f-4282-887b-5a9b163f3c7f",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-20.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4917",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB176:724AC7:5E50909D"
+    }
+  },
+  "uuid": "89902ceb-d28f-4282-887b-5a9b163f3c7f",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-18",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-19",
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21-1c2b0d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21-1c2b0d.json
deleted file mode 100644
index 4838edaa01..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21-1c2b0d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1c2b0dc9-c393-4356-93ed-0dbf29eaa073",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-1c2b0dc9-c393-4356-93ed-0dbf29eaa073.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4916",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB182:724AD6:5E50909D"
-    }
-  },
-  "uuid": "1c2b0dc9-c393-4356-93ed-0dbf29eaa073",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-19",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-20",
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21.json
new file mode 100644
index 0000000000..695fd83bf3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-21.json
@@ -0,0 +1,51 @@
+{
+  "id": "1c2b0dc9-c393-4356-93ed-0dbf29eaa073",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-21.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4916",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB182:724AD6:5E50909D"
+    }
+  },
+  "uuid": "1c2b0dc9-c393-4356-93ed-0dbf29eaa073",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-19",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-20",
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22-5f2792.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22-5f2792.json
deleted file mode 100644
index e8c8d0cc6b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22-5f2792.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5f2792cf-918e-4737-bc45-c253be138496",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-5f2792cf-918e-4737-bc45-c253be138496.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4915",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB18A:724AE2:5E50909D"
-    }
-  },
-  "uuid": "5f2792cf-918e-4737-bc45-c253be138496",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-20",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-21",
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22.json
new file mode 100644
index 0000000000..9ccb6d05b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-22.json
@@ -0,0 +1,51 @@
+{
+  "id": "5f2792cf-918e-4737-bc45-c253be138496",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-22.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4915",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB18A:724AE2:5E50909D"
+    }
+  },
+  "uuid": "5f2792cf-918e-4737-bc45-c253be138496",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-20",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-21",
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23-68f868.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23-68f868.json
deleted file mode 100644
index 56ce7237f3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23-68f868.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "68f868af-ba3c-4215-a7a8-b1270cbbce4f",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-68f868af-ba3c-4215-a7a8-b1270cbbce4f.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4914",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB192:724AEC:5E50909D"
-    }
-  },
-  "uuid": "68f868af-ba3c-4215-a7a8-b1270cbbce4f",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-21",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-22",
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23.json
new file mode 100644
index 0000000000..23c2df1bfc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-23.json
@@ -0,0 +1,51 @@
+{
+  "id": "68f868af-ba3c-4215-a7a8-b1270cbbce4f",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-23.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4914",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB192:724AEC:5E50909D"
+    }
+  },
+  "uuid": "68f868af-ba3c-4215-a7a8-b1270cbbce4f",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-21",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-22",
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24-3da25c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24-3da25c.json
deleted file mode 100644
index 3b2c019de2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24-3da25c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3da25c77-0a96-46f4-b48c-ca514e84349e",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-3da25c77-0a96-46f4-b48c-ca514e84349e.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4913",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB199:724AF5:5E50909D"
-    }
-  },
-  "uuid": "3da25c77-0a96-46f4-b48c-ca514e84349e",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-22",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-23",
-  "insertionIndex": 24
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24.json
new file mode 100644
index 0000000000..a83ebe49c3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-24.json
@@ -0,0 +1,51 @@
+{
+  "id": "3da25c77-0a96-46f4-b48c-ca514e84349e",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-24.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4913",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB199:724AF5:5E50909D"
+    }
+  },
+  "uuid": "3da25c77-0a96-46f4-b48c-ca514e84349e",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-22",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-23",
+  "insertionIndex": 24
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25-5765a2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25-5765a2.json
deleted file mode 100644
index 3beb449ebd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25-5765a2.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5765a28a-f754-4986-be30-e9016247083c",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-5765a28a-f754-4986-be30-e9016247083c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4912",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1A3:724B00:5E50909E"
-    }
-  },
-  "uuid": "5765a28a-f754-4986-be30-e9016247083c",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-23",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-24",
-  "insertionIndex": 25
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25.json
new file mode 100644
index 0000000000..1b0fbb6ecf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-25.json
@@ -0,0 +1,51 @@
+{
+  "id": "5765a28a-f754-4986-be30-e9016247083c",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-25.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4912",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1A3:724B00:5E50909E"
+    }
+  },
+  "uuid": "5765a28a-f754-4986-be30-e9016247083c",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-23",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-24",
+  "insertionIndex": 25
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26-fe73af.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26-fe73af.json
deleted file mode 100644
index cb4f4a7f82..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26-fe73af.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "fe73af36-08b9-4e1c-8aa5-77c6489f2e2c",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-fe73af36-08b9-4e1c-8aa5-77c6489f2e2c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4911",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1C1:724B1C:5E50909E"
-    }
-  },
-  "uuid": "fe73af36-08b9-4e1c-8aa5-77c6489f2e2c",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-24",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-25",
-  "insertionIndex": 26
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26.json
new file mode 100644
index 0000000000..0ddb1c7e36
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-26.json
@@ -0,0 +1,51 @@
+{
+  "id": "fe73af36-08b9-4e1c-8aa5-77c6489f2e2c",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-26.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4911",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1C1:724B1C:5E50909E"
+    }
+  },
+  "uuid": "fe73af36-08b9-4e1c-8aa5-77c6489f2e2c",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-24",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-25",
+  "insertionIndex": 26
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27-a11d11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27-a11d11.json
deleted file mode 100644
index 94f6d232f2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27-a11d11.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "a11d115c-2e43-4565-8097-e504023c904b",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-a11d115c-2e43-4565-8097-e504023c904b.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4910",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1CE:724B33:5E50909E"
-    }
-  },
-  "uuid": "a11d115c-2e43-4565-8097-e504023c904b",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-25",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-26",
-  "insertionIndex": 27
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27.json
new file mode 100644
index 0000000000..8c8bd34698
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-27.json
@@ -0,0 +1,51 @@
+{
+  "id": "a11d115c-2e43-4565-8097-e504023c904b",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-27.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1CE:724B33:5E50909E"
+    }
+  },
+  "uuid": "a11d115c-2e43-4565-8097-e504023c904b",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-25",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-26",
+  "insertionIndex": 27
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28-c4fbb5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28-c4fbb5.json
deleted file mode 100644
index c96c599dcd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28-c4fbb5.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c4fbb565-2111-4817-86f3-e5598f391a6c",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-c4fbb565-2111-4817-86f3-e5598f391a6c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4909",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1D7:724B3F:5E50909E"
-    }
-  },
-  "uuid": "c4fbb565-2111-4817-86f3-e5598f391a6c",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-26",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-27",
-  "insertionIndex": 28
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28.json
new file mode 100644
index 0000000000..b36825ab76
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-28.json
@@ -0,0 +1,51 @@
+{
+  "id": "c4fbb565-2111-4817-86f3-e5598f391a6c",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-28.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4909",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1D7:724B3F:5E50909E"
+    }
+  },
+  "uuid": "c4fbb565-2111-4817-86f3-e5598f391a6c",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-26",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-27",
+  "insertionIndex": 28
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29-7d8310.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29-7d8310.json
deleted file mode 100644
index 642071af8d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29-7d8310.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "7d831041-a17e-4591-b3e9-98e66530cdf9",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-7d831041-a17e-4591-b3e9-98e66530cdf9.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1E0:724B49:5E50909F"
-    }
-  },
-  "uuid": "7d831041-a17e-4591-b3e9-98e66530cdf9",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-27",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-28",
-  "insertionIndex": 29
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29.json
new file mode 100644
index 0000000000..0a400cbbda
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-29.json
@@ -0,0 +1,51 @@
+{
+  "id": "7d831041-a17e-4591-b3e9-98e66530cdf9",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-29.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1E0:724B49:5E50909F"
+    }
+  },
+  "uuid": "7d831041-a17e-4591-b3e9-98e66530cdf9",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-27",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-28",
+  "insertionIndex": 29
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3-c68776.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3-c68776.json
deleted file mode 100644
index 1ecd7e1700..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3-c68776.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c68776fa-2888-40be-b35d-7f5dc29de9c8",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-c68776fa-2888-40be-b35d-7f5dc29de9c8.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB0E2:724A07:5E509099"
-    }
-  },
-  "uuid": "c68776fa-2888-40be-b35d-7f5dc29de9c8",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..925289c798
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "c68776fa-2888-40be-b35d-7f5dc29de9c8",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB0E2:724A07:5E509099"
+    }
+  },
+  "uuid": "c68776fa-2888-40be-b35d-7f5dc29de9c8",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30-c300b8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30-c300b8.json
deleted file mode 100644
index 2b28d49ea5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30-c300b8.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c300b8a5-ba5f-4c83-9a48-fb12a355f23e",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-c300b8a5-ba5f-4c83-9a48-fb12a355f23e.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1E9:724B51:5E50909F"
-    }
-  },
-  "uuid": "c300b8a5-ba5f-4c83-9a48-fb12a355f23e",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-28",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-29",
-  "insertionIndex": 30
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30.json
new file mode 100644
index 0000000000..9afa2af5b5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-30.json
@@ -0,0 +1,51 @@
+{
+  "id": "c300b8a5-ba5f-4c83-9a48-fb12a355f23e",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-30.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4907",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1E9:724B51:5E50909F"
+    }
+  },
+  "uuid": "c300b8a5-ba5f-4c83-9a48-fb12a355f23e",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-28",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-29",
+  "insertionIndex": 30
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31-c363dc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31-c363dc.json
deleted file mode 100644
index 39bb60ecb1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31-c363dc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c363dc3e-d01d-40ee-8858-6df8433e4697",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-c363dc3e-d01d-40ee-8858-6df8433e4697.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4906",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1F2:724B60:5E50909F"
-    }
-  },
-  "uuid": "c363dc3e-d01d-40ee-8858-6df8433e4697",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-29",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-30",
-  "insertionIndex": 31
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31.json
new file mode 100644
index 0000000000..86bde3150b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-31.json
@@ -0,0 +1,51 @@
+{
+  "id": "c363dc3e-d01d-40ee-8858-6df8433e4697",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-31.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4906",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1F2:724B60:5E50909F"
+    }
+  },
+  "uuid": "c363dc3e-d01d-40ee-8858-6df8433e4697",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-29",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-30",
+  "insertionIndex": 31
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32-5f4c64.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32-5f4c64.json
deleted file mode 100644
index 179be6f9fa..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32-5f4c64.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5f4c645c-c4ea-4d46-afd6-2bab121b6a19",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-5f4c645c-c4ea-4d46-afd6-2bab121b6a19.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4905",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB1F8:724B68:5E50909F"
-    }
-  },
-  "uuid": "5f4c645c-c4ea-4d46-afd6-2bab121b6a19",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-30",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-31",
-  "insertionIndex": 32
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32.json
new file mode 100644
index 0000000000..a22f93a030
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-32.json
@@ -0,0 +1,51 @@
+{
+  "id": "5f4c645c-c4ea-4d46-afd6-2bab121b6a19",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-32.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4905",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB1F8:724B68:5E50909F"
+    }
+  },
+  "uuid": "5f4c645c-c4ea-4d46-afd6-2bab121b6a19",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-30",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-31",
+  "insertionIndex": 32
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34-1dc4cd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34-1dc4cd.json
deleted file mode 100644
index 0a40fd24ad..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34-1dc4cd.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1dc4cd7d-3dda-4b61-881d-53f0f9f396da",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-1dc4cd7d-3dda-4b61-881d-53f0f9f396da.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4904",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB213:724B84:5E5090A0"
-    }
-  },
-  "uuid": "1dc4cd7d-3dda-4b61-881d-53f0f9f396da",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-31",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-32",
-  "insertionIndex": 34
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34.json
new file mode 100644
index 0000000000..00d76afaff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-34.json
@@ -0,0 +1,51 @@
+{
+  "id": "1dc4cd7d-3dda-4b61-881d-53f0f9f396da",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-34.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4904",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB213:724B84:5E5090A0"
+    }
+  },
+  "uuid": "1dc4cd7d-3dda-4b61-881d-53f0f9f396da",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-31",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-32",
+  "insertionIndex": 34
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35-598ba8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35-598ba8.json
deleted file mode 100644
index 52489e70f5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35-598ba8.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "598ba839-d205-49d9-a035-ef234f6664a2",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-598ba839-d205-49d9-a035-ef234f6664a2.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4903",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB21D:724B8D:5E5090A0"
-    }
-  },
-  "uuid": "598ba839-d205-49d9-a035-ef234f6664a2",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-32",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-33",
-  "insertionIndex": 35
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35.json
new file mode 100644
index 0000000000..4ae6c14722
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-35.json
@@ -0,0 +1,51 @@
+{
+  "id": "598ba839-d205-49d9-a035-ef234f6664a2",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-35.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4903",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB21D:724B8D:5E5090A0"
+    }
+  },
+  "uuid": "598ba839-d205-49d9-a035-ef234f6664a2",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-32",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-33",
+  "insertionIndex": 35
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36-d7fec7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36-d7fec7.json
deleted file mode 100644
index d32fe29c56..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36-d7fec7.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d7fec78a-8d2f-49af-92f9-a647a90190ff",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-d7fec78a-8d2f-49af-92f9-a647a90190ff.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4902",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB226:724B95:5E5090A0"
-    }
-  },
-  "uuid": "d7fec78a-8d2f-49af-92f9-a647a90190ff",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-33",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-34",
-  "insertionIndex": 36
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36.json
new file mode 100644
index 0000000000..39ddbbaab8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-36.json
@@ -0,0 +1,51 @@
+{
+  "id": "d7fec78a-8d2f-49af-92f9-a647a90190ff",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-36.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4902",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB226:724B95:5E5090A0"
+    }
+  },
+  "uuid": "d7fec78a-8d2f-49af-92f9-a647a90190ff",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-33",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-34",
+  "insertionIndex": 36
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37-24a9c4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37-24a9c4.json
deleted file mode 100644
index 31e18b8790..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37-24a9c4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4901",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB22D:724B9F:5E5090A0"
-    }
-  },
-  "uuid": "24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-34",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-35",
-  "insertionIndex": 37
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37.json
new file mode 100644
index 0000000000..874a42a0e9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-37.json
@@ -0,0 +1,51 @@
+{
+  "id": "24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-37.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4901",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB22D:724B9F:5E5090A0"
+    }
+  },
+  "uuid": "24a9c4a9-6ea3-4272-9bcd-510aa4f0cb16",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-34",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-35",
+  "insertionIndex": 37
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38-11236d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38-11236d.json
deleted file mode 100644
index f37bff45ba..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38-11236d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "11236d5f-f9ac-46bc-8df5-74a3c0530d01",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-11236d5f-f9ac-46bc-8df5-74a3c0530d01.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB238:724BAA:5E5090A1"
-    }
-  },
-  "uuid": "11236d5f-f9ac-46bc-8df5-74a3c0530d01",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-35",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-36",
-  "insertionIndex": 38
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38.json
new file mode 100644
index 0000000000..6ec57a98f0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-38.json
@@ -0,0 +1,51 @@
+{
+  "id": "11236d5f-f9ac-46bc-8df5-74a3c0530d01",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-38.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4900",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB238:724BAA:5E5090A1"
+    }
+  },
+  "uuid": "11236d5f-f9ac-46bc-8df5-74a3c0530d01",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-35",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-36",
+  "insertionIndex": 38
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39-a4f2d2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39-a4f2d2.json
deleted file mode 100644
index 0a613b7498..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39-a4f2d2.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB23F:724BB6:5E5090A1"
-    }
-  },
-  "uuid": "a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-36",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-37",
-  "insertionIndex": 39
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39.json
new file mode 100644
index 0000000000..18da59f9fc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-39.json
@@ -0,0 +1,51 @@
+{
+  "id": "a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-39.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4899",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB23F:724BB6:5E5090A1"
+    }
+  },
+  "uuid": "a4f2d2de-cb73-4051-8b93-e3f3fd9f29a8",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-36",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-37",
+  "insertionIndex": 39
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4-db288d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4-db288d.json
deleted file mode 100644
index c33cd88e53..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4-db288d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "db288d44-d417-4fcc-b1a6-4fa1d1fd0764",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-db288d44-d417-4fcc-b1a6-4fa1d1fd0764.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB0EC:724A1D:5E50909A"
-    }
-  },
-  "uuid": "db288d44-d417-4fcc-b1a6-4fa1d1fd0764",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-2",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-3",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4.json
new file mode 100644
index 0000000000..204ec6ecf2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-4.json
@@ -0,0 +1,51 @@
+{
+  "id": "db288d44-d417-4fcc-b1a6-4fa1d1fd0764",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-4.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB0EC:724A1D:5E50909A"
+    }
+  },
+  "uuid": "db288d44-d417-4fcc-b1a6-4fa1d1fd0764",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-2",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-3",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40-d578ab.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40-d578ab.json
deleted file mode 100644
index 31bf47ef2e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40-d578ab.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d578ab70-40b9-48a1-8cd3-18d8e5b17a71",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-d578ab70-40b9-48a1-8cd3-18d8e5b17a71.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4898",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB248:724BC3:5E5090A1"
-    }
-  },
-  "uuid": "d578ab70-40b9-48a1-8cd3-18d8e5b17a71",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-37",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-38",
-  "insertionIndex": 40
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40.json
new file mode 100644
index 0000000000..039f1e59fd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-40.json
@@ -0,0 +1,51 @@
+{
+  "id": "d578ab70-40b9-48a1-8cd3-18d8e5b17a71",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-40.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4898",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB248:724BC3:5E5090A1"
+    }
+  },
+  "uuid": "d578ab70-40b9-48a1-8cd3-18d8e5b17a71",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-37",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-38",
+  "insertionIndex": 40
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41-8eeab8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41-8eeab8.json
deleted file mode 100644
index 1e848ac05a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41-8eeab8.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "8eeab8d2-aad7-42a5-a940-b57cab9fe3ec",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-8eeab8d2-aad7-42a5-a940-b57cab9fe3ec.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB251:724BCD:5E5090A1"
-    }
-  },
-  "uuid": "8eeab8d2-aad7-42a5-a940-b57cab9fe3ec",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-38",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-39",
-  "insertionIndex": 41
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41.json
new file mode 100644
index 0000000000..1bb1110bd5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-41.json
@@ -0,0 +1,51 @@
+{
+  "id": "8eeab8d2-aad7-42a5-a940-b57cab9fe3ec",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-41.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB251:724BCD:5E5090A1"
+    }
+  },
+  "uuid": "8eeab8d2-aad7-42a5-a940-b57cab9fe3ec",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-38",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-39",
+  "insertionIndex": 41
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42-8dd6b0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42-8dd6b0.json
deleted file mode 100644
index f9ede61c5c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42-8dd6b0.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "8dd6b062-3e66-4047-9dff-989e7f229f29",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-8dd6b062-3e66-4047-9dff-989e7f229f29.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB25F:724BDB:5E5090A1"
-    }
-  },
-  "uuid": "8dd6b062-3e66-4047-9dff-989e7f229f29",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-39",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-40",
-  "insertionIndex": 42
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42.json
new file mode 100644
index 0000000000..951e474706
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-42.json
@@ -0,0 +1,51 @@
+{
+  "id": "8dd6b062-3e66-4047-9dff-989e7f229f29",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-42.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB25F:724BDB:5E5090A1"
+    }
+  },
+  "uuid": "8dd6b062-3e66-4047-9dff-989e7f229f29",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-39",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-40",
+  "insertionIndex": 42
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43-50679d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43-50679d.json
deleted file mode 100644
index c62697149b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43-50679d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "50679dd0-df4e-432b-85fa-bc3f72980bb3",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-50679dd0-df4e-432b-85fa-bc3f72980bb3.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4895",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB264:724BE2:5E5090A1"
-    }
-  },
-  "uuid": "50679dd0-df4e-432b-85fa-bc3f72980bb3",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-40",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-41",
-  "insertionIndex": 43
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43.json
new file mode 100644
index 0000000000..dc14f525ae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-43.json
@@ -0,0 +1,51 @@
+{
+  "id": "50679dd0-df4e-432b-85fa-bc3f72980bb3",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-43.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4895",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB264:724BE2:5E5090A1"
+    }
+  },
+  "uuid": "50679dd0-df4e-432b-85fa-bc3f72980bb3",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-40",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-41",
+  "insertionIndex": 43
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44-d7c509.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44-d7c509.json
deleted file mode 100644
index 4f53160a07..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44-d7c509.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d7c5093b-fde1-44e2-9c99-b951a1af1f8b",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-d7c5093b-fde1-44e2-9c99-b951a1af1f8b.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4894",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB26F:724BEB:5E5090A2"
-    }
-  },
-  "uuid": "d7c5093b-fde1-44e2-9c99-b951a1af1f8b",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-41",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-42",
-  "insertionIndex": 44
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44.json
new file mode 100644
index 0000000000..d64c9a68de
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-44.json
@@ -0,0 +1,51 @@
+{
+  "id": "d7c5093b-fde1-44e2-9c99-b951a1af1f8b",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-44.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4894",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB26F:724BEB:5E5090A2"
+    }
+  },
+  "uuid": "d7c5093b-fde1-44e2-9c99-b951a1af1f8b",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-41",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-42",
+  "insertionIndex": 44
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45-f7ed81.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45-f7ed81.json
deleted file mode 100644
index fd327b2f77..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45-f7ed81.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "f7ed8103-6fcb-4fc6-8fc8-3a2581841897",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-f7ed8103-6fcb-4fc6-8fc8-3a2581841897.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4893",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB274:724BF6:5E5090A2"
-    }
-  },
-  "uuid": "f7ed8103-6fcb-4fc6-8fc8-3a2581841897",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-42",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-43",
-  "insertionIndex": 45
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45.json
new file mode 100644
index 0000000000..b414d7771c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-45.json
@@ -0,0 +1,51 @@
+{
+  "id": "f7ed8103-6fcb-4fc6-8fc8-3a2581841897",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-45.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4893",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB274:724BF6:5E5090A2"
+    }
+  },
+  "uuid": "f7ed8103-6fcb-4fc6-8fc8-3a2581841897",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-42",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-43",
+  "insertionIndex": 45
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46-46e796.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46-46e796.json
deleted file mode 100644
index 3686d55dd0..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46-46e796.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "46e796bd-5015-48c3-9b4b-954a846a5aa3",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-46e796bd-5015-48c3-9b4b-954a846a5aa3.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4892",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB27B:724BFF:5E5090A2"
-    }
-  },
-  "uuid": "46e796bd-5015-48c3-9b4b-954a846a5aa3",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-43",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-44",
-  "insertionIndex": 46
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46.json
new file mode 100644
index 0000000000..18a29f2ed7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-46.json
@@ -0,0 +1,51 @@
+{
+  "id": "46e796bd-5015-48c3-9b4b-954a846a5aa3",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-46.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4892",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB27B:724BFF:5E5090A2"
+    }
+  },
+  "uuid": "46e796bd-5015-48c3-9b4b-954a846a5aa3",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-43",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-44",
+  "insertionIndex": 46
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47-ce3916.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47-ce3916.json
deleted file mode 100644
index 7a211a9f5a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47-ce3916.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "ce3916ac-a5ba-4f3b-a28f-fbcb451822df",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-ce3916ac-a5ba-4f3b-a28f-fbcb451822df.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4891",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB289:724C10:5E5090A2"
-    }
-  },
-  "uuid": "ce3916ac-a5ba-4f3b-a28f-fbcb451822df",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-44",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-45",
-  "insertionIndex": 47
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47.json
new file mode 100644
index 0000000000..6c97952097
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-47.json
@@ -0,0 +1,51 @@
+{
+  "id": "ce3916ac-a5ba-4f3b-a28f-fbcb451822df",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-47.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4891",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB289:724C10:5E5090A2"
+    }
+  },
+  "uuid": "ce3916ac-a5ba-4f3b-a28f-fbcb451822df",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-44",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-45",
+  "insertionIndex": 47
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48-3c19ad.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48-3c19ad.json
deleted file mode 100644
index de9e813394..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48-3c19ad.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3c19ad8d-5e22-48d0-9622-b89de17225a5",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-3c19ad8d-5e22-48d0-9622-b89de17225a5.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4890",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB291:724C1B:5E5090A2"
-    }
-  },
-  "uuid": "3c19ad8d-5e22-48d0-9622-b89de17225a5",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-45",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-46",
-  "insertionIndex": 48
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48.json
new file mode 100644
index 0000000000..ccd88cbe71
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-48.json
@@ -0,0 +1,51 @@
+{
+  "id": "3c19ad8d-5e22-48d0-9622-b89de17225a5",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-48.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4890",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB291:724C1B:5E5090A2"
+    }
+  },
+  "uuid": "3c19ad8d-5e22-48d0-9622-b89de17225a5",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-45",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-46",
+  "insertionIndex": 48
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49-2b9566.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49-2b9566.json
deleted file mode 100644
index b5c15ca5be..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49-2b9566.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2b956666-2508-4e00-ad10-91f6f465d3b6",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-2b956666-2508-4e00-ad10-91f6f465d3b6.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4889",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB29B:724C25:5E5090A2"
-    }
-  },
-  "uuid": "2b956666-2508-4e00-ad10-91f6f465d3b6",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-46",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-47",
-  "insertionIndex": 49
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49.json
new file mode 100644
index 0000000000..613e7c9668
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-49.json
@@ -0,0 +1,51 @@
+{
+  "id": "2b956666-2508-4e00-ad10-91f6f465d3b6",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-49.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4889",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB29B:724C25:5E5090A2"
+    }
+  },
+  "uuid": "2b956666-2508-4e00-ad10-91f6f465d3b6",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-46",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-47",
+  "insertionIndex": 49
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5-34380f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5-34380f.json
deleted file mode 100644
index 8f97c0121f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5-34380f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB0F3:724A27:5E50909A"
-    }
-  },
-  "uuid": "34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-3",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-4",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5.json
new file mode 100644
index 0000000000..813ff73419
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-5.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB0F3:724A27:5E50909A"
+    }
+  },
+  "uuid": "34380fb1-a9ae-4d64-89a6-a4ec35c1a6a6",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-3",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-4",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50-061d63.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50-061d63.json
deleted file mode 100644
index 4ae60cf596..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50-061d63.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "061d63fb-a9bd-4d26-836d-9261dd42930d",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-061d63fb-a9bd-4d26-836d-9261dd42930d.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4888",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2A4:724C30:5E5090A3"
-    }
-  },
-  "uuid": "061d63fb-a9bd-4d26-836d-9261dd42930d",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-47",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-48",
-  "insertionIndex": 50
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50.json
new file mode 100644
index 0000000000..f3106aa7e4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-50.json
@@ -0,0 +1,51 @@
+{
+  "id": "061d63fb-a9bd-4d26-836d-9261dd42930d",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-50.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4888",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2A4:724C30:5E5090A3"
+    }
+  },
+  "uuid": "061d63fb-a9bd-4d26-836d-9261dd42930d",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-47",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-48",
+  "insertionIndex": 50
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51-244992.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51-244992.json
deleted file mode 100644
index 7f95aa68e4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51-244992.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2449929f-f645-478c-a200-84c46cd27f6a",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-2449929f-f645-478c-a200-84c46cd27f6a.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4887",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2B0:724C3C:5E5090A3"
-    }
-  },
-  "uuid": "2449929f-f645-478c-a200-84c46cd27f6a",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-48",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-49",
-  "insertionIndex": 51
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51.json
new file mode 100644
index 0000000000..b42a7c5413
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-51.json
@@ -0,0 +1,51 @@
+{
+  "id": "2449929f-f645-478c-a200-84c46cd27f6a",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-51.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4887",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2B0:724C3C:5E5090A3"
+    }
+  },
+  "uuid": "2449929f-f645-478c-a200-84c46cd27f6a",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-48",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-49",
+  "insertionIndex": 51
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52-69de99.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52-69de99.json
deleted file mode 100644
index 1aeb6dea68..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52-69de99.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "69de9951-24b6-4611-a4ee-59ba945a3f40",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-69de9951-24b6-4611-a4ee-59ba945a3f40.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4886",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2B9:724C48:5E5090A3"
-    }
-  },
-  "uuid": "69de9951-24b6-4611-a4ee-59ba945a3f40",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-49",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-50",
-  "insertionIndex": 52
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52.json
new file mode 100644
index 0000000000..c1e2211e1b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-52.json
@@ -0,0 +1,51 @@
+{
+  "id": "69de9951-24b6-4611-a4ee-59ba945a3f40",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-52.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4886",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2B9:724C48:5E5090A3"
+    }
+  },
+  "uuid": "69de9951-24b6-4611-a4ee-59ba945a3f40",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-49",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-50",
+  "insertionIndex": 52
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53-df1433.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53-df1433.json
deleted file mode 100644
index f36bdb8f46..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53-df1433.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "df143360-27af-463f-9d79-8c257992e7a8",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-df143360-27af-463f-9d79-8c257992e7a8.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4885",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2C0:724C52:5E5090A3"
-    }
-  },
-  "uuid": "df143360-27af-463f-9d79-8c257992e7a8",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-50",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-51",
-  "insertionIndex": 53
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53.json
new file mode 100644
index 0000000000..3c658956ff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-53.json
@@ -0,0 +1,51 @@
+{
+  "id": "df143360-27af-463f-9d79-8c257992e7a8",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-53.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4885",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2C0:724C52:5E5090A3"
+    }
+  },
+  "uuid": "df143360-27af-463f-9d79-8c257992e7a8",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-50",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-51",
+  "insertionIndex": 53
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54-c80963.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54-c80963.json
deleted file mode 100644
index f88b5dbb5e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54-c80963.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c80963b9-e025-41c3-b58c-05e05b668635",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-c80963b9-e025-41c3-b58c-05e05b668635.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4884",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2CA:724C5E:5E5090A3"
-    }
-  },
-  "uuid": "c80963b9-e025-41c3-b58c-05e05b668635",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-51",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-52",
-  "insertionIndex": 54
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54.json
new file mode 100644
index 0000000000..cded49e12a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-54.json
@@ -0,0 +1,51 @@
+{
+  "id": "c80963b9-e025-41c3-b58c-05e05b668635",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-54.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4884",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2CA:724C5E:5E5090A3"
+    }
+  },
+  "uuid": "c80963b9-e025-41c3-b58c-05e05b668635",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-51",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-52",
+  "insertionIndex": 54
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55-68d3a2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55-68d3a2.json
deleted file mode 100644
index ecc6fb6881..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55-68d3a2.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "68d3a2e3-9145-47b2-bdf4-7bd97aa73888",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-68d3a2e3-9145-47b2-bdf4-7bd97aa73888.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4883",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2D5:724C69:5E5090A4"
-    }
-  },
-  "uuid": "68d3a2e3-9145-47b2-bdf4-7bd97aa73888",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-52",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-53",
-  "insertionIndex": 55
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55.json
new file mode 100644
index 0000000000..0de748a1f6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-55.json
@@ -0,0 +1,51 @@
+{
+  "id": "68d3a2e3-9145-47b2-bdf4-7bd97aa73888",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-55.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4883",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2D5:724C69:5E5090A4"
+    }
+  },
+  "uuid": "68d3a2e3-9145-47b2-bdf4-7bd97aa73888",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-52",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-53",
+  "insertionIndex": 55
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56-0b1ed9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56-0b1ed9.json
deleted file mode 100644
index efc80a696b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56-0b1ed9.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "0b1ed97e-e317-43be-848e-3710f427cc76",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-0b1ed97e-e317-43be-848e-3710f427cc76.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4882",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2DE:724C74:5E5090A4"
-    }
-  },
-  "uuid": "0b1ed97e-e317-43be-848e-3710f427cc76",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-53",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-54",
-  "insertionIndex": 56
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56.json
new file mode 100644
index 0000000000..a4f7718727
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-56.json
@@ -0,0 +1,51 @@
+{
+  "id": "0b1ed97e-e317-43be-848e-3710f427cc76",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-56.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4882",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2DE:724C74:5E5090A4"
+    }
+  },
+  "uuid": "0b1ed97e-e317-43be-848e-3710f427cc76",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-53",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-54",
+  "insertionIndex": 56
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57-016aa7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57-016aa7.json
deleted file mode 100644
index 44fbb31ba9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57-016aa7.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "016aa7d1-f62e-49e2-9be0-34111d49b832",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-016aa7d1-f62e-49e2-9be0-34111d49b832.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4881",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2EA:724C82:5E5090A4"
-    }
-  },
-  "uuid": "016aa7d1-f62e-49e2-9be0-34111d49b832",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-54",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-55",
-  "insertionIndex": 57
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57.json
new file mode 100644
index 0000000000..13c368d890
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-57.json
@@ -0,0 +1,51 @@
+{
+  "id": "016aa7d1-f62e-49e2-9be0-34111d49b832",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-57.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4881",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2EA:724C82:5E5090A4"
+    }
+  },
+  "uuid": "016aa7d1-f62e-49e2-9be0-34111d49b832",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-54",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-55",
+  "insertionIndex": 57
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58-e0294e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58-e0294e.json
deleted file mode 100644
index 4e1d35fd27..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58-e0294e.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "e0294eea-1425-4dbf-82f7-44cf6ec78634",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-e0294eea-1425-4dbf-82f7-44cf6ec78634.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4880",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2EE:724C88:5E5090A4"
-    }
-  },
-  "uuid": "e0294eea-1425-4dbf-82f7-44cf6ec78634",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-55",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-56",
-  "insertionIndex": 58
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58.json
new file mode 100644
index 0000000000..39bb59ce65
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-58.json
@@ -0,0 +1,51 @@
+{
+  "id": "e0294eea-1425-4dbf-82f7-44cf6ec78634",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-58.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4880",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2EE:724C88:5E5090A4"
+    }
+  },
+  "uuid": "e0294eea-1425-4dbf-82f7-44cf6ec78634",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-55",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-56",
+  "insertionIndex": 58
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59-d52fd2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59-d52fd2.json
deleted file mode 100644
index 21ed4b61c1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59-d52fd2.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d52fd23a-7f97-41db-8361-02119185c8cf",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-d52fd23a-7f97-41db-8361-02119185c8cf.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4879",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB2F7:724C92:5E5090A4"
-    }
-  },
-  "uuid": "d52fd23a-7f97-41db-8361-02119185c8cf",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-56",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-57",
-  "insertionIndex": 59
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59.json
new file mode 100644
index 0000000000..883f36ea7b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-59.json
@@ -0,0 +1,51 @@
+{
+  "id": "d52fd23a-7f97-41db-8361-02119185c8cf",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-59.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4879",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB2F7:724C92:5E5090A4"
+    }
+  },
+  "uuid": "d52fd23a-7f97-41db-8361-02119185c8cf",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-56",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-57",
+  "insertionIndex": 59
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6-91a31f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6-91a31f.json
deleted file mode 100644
index b82fb2a628..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6-91a31f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "91a31faf-a765-4032-9ab2-572dc9c75442",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-91a31faf-a765-4032-9ab2-572dc9c75442.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4931",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB0FC:724A35:5E50909A"
-    }
-  },
-  "uuid": "91a31faf-a765-4032-9ab2-572dc9c75442",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-4",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-5",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6.json
new file mode 100644
index 0000000000..eb6e309902
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "91a31faf-a765-4032-9ab2-572dc9c75442",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-6.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB0FC:724A35:5E50909A"
+    }
+  },
+  "uuid": "91a31faf-a765-4032-9ab2-572dc9c75442",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-4",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-5",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60-93f988.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60-93f988.json
deleted file mode 100644
index c4f1cd93ae..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60-93f988.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "93f9887a-c450-44be-8e98-1abec0784450",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-93f9887a-c450-44be-8e98-1abec0784450.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4878",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB302:724C9E:5E5090A5"
-    }
-  },
-  "uuid": "93f9887a-c450-44be-8e98-1abec0784450",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-57",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-58",
-  "insertionIndex": 60
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60.json
new file mode 100644
index 0000000000..6a64617420
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-60.json
@@ -0,0 +1,51 @@
+{
+  "id": "93f9887a-c450-44be-8e98-1abec0784450",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-60.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4878",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB302:724C9E:5E5090A5"
+    }
+  },
+  "uuid": "93f9887a-c450-44be-8e98-1abec0784450",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-57",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-58",
+  "insertionIndex": 60
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61-288d44.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61-288d44.json
deleted file mode 100644
index 4494cab38b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61-288d44.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "288d443b-fb97-49a0-85ec-b384c81e5c29",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-288d443b-fb97-49a0-85ec-b384c81e5c29.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4877",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB30A:724CAC:5E5090A5"
-    }
-  },
-  "uuid": "288d443b-fb97-49a0-85ec-b384c81e5c29",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-58",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-59",
-  "insertionIndex": 61
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61.json
new file mode 100644
index 0000000000..a654415786
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-61.json
@@ -0,0 +1,51 @@
+{
+  "id": "288d443b-fb97-49a0-85ec-b384c81e5c29",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-61.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4877",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB30A:724CAC:5E5090A5"
+    }
+  },
+  "uuid": "288d443b-fb97-49a0-85ec-b384c81e5c29",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-58",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-59",
+  "insertionIndex": 61
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62-c56228.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62-c56228.json
deleted file mode 100644
index b472af240d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62-c56228.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c56228ec-bb80-431a-853d-2da082c0c524",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-c56228ec-bb80-431a-853d-2da082c0c524.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4876",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB313:724CB3:5E5090A5"
-    }
-  },
-  "uuid": "c56228ec-bb80-431a-853d-2da082c0c524",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-59",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-60",
-  "insertionIndex": 62
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62.json
new file mode 100644
index 0000000000..9e39e38f6f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-62.json
@@ -0,0 +1,51 @@
+{
+  "id": "c56228ec-bb80-431a-853d-2da082c0c524",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-62.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4876",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB313:724CB3:5E5090A5"
+    }
+  },
+  "uuid": "c56228ec-bb80-431a-853d-2da082c0c524",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-59",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-60",
+  "insertionIndex": 62
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63-70bc80.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63-70bc80.json
deleted file mode 100644
index 3cd55d4fcf..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63-70bc80.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "70bc8011-2466-4bba-97f7-abd03bbc5ba3",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-70bc8011-2466-4bba-97f7-abd03bbc5ba3.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4875",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB31C:724CC1:5E5090A5"
-    }
-  },
-  "uuid": "70bc8011-2466-4bba-97f7-abd03bbc5ba3",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-60",
-  "insertionIndex": 63
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63.json
new file mode 100644
index 0000000000..25fe359a95
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-63.json
@@ -0,0 +1,50 @@
+{
+  "id": "70bc8011-2466-4bba-97f7-abd03bbc5ba3",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-63.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4875",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB31C:724CC1:5E5090A5"
+    }
+  },
+  "uuid": "70bc8011-2466-4bba-97f7-abd03bbc5ba3",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-60",
+  "insertionIndex": 63
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7-7d9426.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7-7d9426.json
deleted file mode 100644
index 5a6c33f86f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7-7d9426.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "7d942646-69e0-4427-a560-971b1acaa32d",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-7d942646-69e0-4427-a560-971b1acaa32d.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB109:724A45:5E50909A"
-    }
-  },
-  "uuid": "7d942646-69e0-4427-a560-971b1acaa32d",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-5",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-6",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7.json
new file mode 100644
index 0000000000..0afa289f50
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-7.json
@@ -0,0 +1,51 @@
+{
+  "id": "7d942646-69e0-4427-a560-971b1acaa32d",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-7.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB109:724A45:5E50909A"
+    }
+  },
+  "uuid": "7d942646-69e0-4427-a560-971b1acaa32d",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-5",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-6",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8-dc6c74.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8-dc6c74.json
deleted file mode 100644
index 1e826dc2b1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8-dc6c74.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "dc6c74e4-526f-4707-b50e-42ad3933c40a",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-dc6c74e4-526f-4707-b50e-42ad3933c40a.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4929",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB113:724A50:5E50909A"
-    }
-  },
-  "uuid": "dc6c74e4-526f-4707-b50e-42ad3933c40a",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-6",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-7",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8.json
new file mode 100644
index 0000000000..a8cc182d44
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-8.json
@@ -0,0 +1,51 @@
+{
+  "id": "dc6c74e4-526f-4707-b50e-42ad3933c40a",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-8.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4929",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB113:724A50:5E50909A"
+    }
+  },
+  "uuid": "dc6c74e4-526f-4707-b50e-42ad3933c40a",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-6",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-7",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9-a217bd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9-a217bd.json
deleted file mode 100644
index 839e6e4ff3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9-a217bd.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "a217bdca-af93-42db-9189-440c435acdb0",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-a217bdca-af93-42db-9189-440c435acdb0.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4928",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
-      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB11B:724A59:5E50909B"
-    }
-  },
-  "uuid": "a217bdca-af93-42db-9189-440c435acdb0",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-github-api",
-  "requiredScenarioState": "scenario-2-repos-github-api-github-api-7",
-  "newScenarioState": "scenario-2-repos-github-api-github-api-8",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9.json
new file mode 100644
index 0000000000..87ab5fa302
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api-9.json
@@ -0,0 +1,51 @@
+{
+  "id": "a217bdca-af93-42db-9189-440c435acdb0",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-9.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4928",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d5d38e5710ac5b39e093ef4305c2ce4\"",
+      "Last-Modified": "Fri, 21 Feb 2020 23:58:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB11B:724A59:5E50909B"
+    }
+  },
+  "uuid": "a217bdca-af93-42db-9189-440c435acdb0",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-github-api",
+  "requiredScenarioState": "scenario-2-repos-github-api-github-api-7",
+  "newScenarioState": "scenario-2-repos-github-api-github-api-8",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64-5380ce.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64-5380ce.json
deleted file mode 100644
index 5ae529c2e4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64-5380ce.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5380cece-177e-4cf9-b842-8fcce67d9528",
-  "name": "repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/fad203a66df32f717ba27d9248e5996fbbf6378c",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-5380cece-177e-4cf9-b842-8fcce67d9528.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4874",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"5492b97afdb39a2738c3aa149812ac48\"",
-      "Last-Modified": "Tue, 06 Nov 2018 16:42:28 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB329:724CCE:5E5090A5"
-    }
-  },
-  "uuid": "5380cece-177e-4cf9-b842-8fcce67d9528",
-  "persistent": true,
-  "insertionIndex": 64
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json
new file mode 100644
index 0000000000..aa41d454da
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json
@@ -0,0 +1,48 @@
+{
+  "id": "5380cece-177e-4cf9-b842-8fcce67d9528",
+  "name": "repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/fad203a66df32f717ba27d9248e5996fbbf6378c",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_fad203a66df32f717ba27d9248e5996fbbf6378c-64.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4874",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"5492b97afdb39a2738c3aa149812ac48\"",
+      "Last-Modified": "Tue, 06 Nov 2018 16:42:28 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB329:724CCE:5E5090A5"
+    }
+  },
+  "uuid": "5380cece-177e-4cf9-b842-8fcce67d9528",
+  "persistent": true,
+  "insertionIndex": 64
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2-c94d38.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2-c94d38.json
deleted file mode 100644
index 3497c59c72..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2-c94d38.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb",
-  "name": "search_commits",
-  "request": {
-    "url": "/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.cloak-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_commits-c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "29",
-      "X-RateLimit-Reset": "1582338261",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.cloak-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB0C3:7249C6:5E509098",
-      "Link": "<https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=2>; rel=\"next\", <https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=30>; rel=\"last\""
-    }
-  },
-  "uuid": "c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb",
-  "persistent": true,
-  "scenarioName": "scenario-1-search-commits",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-search-commits-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2.json
new file mode 100644
index 0000000000..949a145fc9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb",
+  "name": "search_commits",
+  "request": {
+    "url": "/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.cloak-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_commits-2.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "29",
+      "X-RateLimit-Reset": "1582338261",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.cloak-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB0C3:7249C6:5E509098",
+      "Link": "<https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=2>; rel=\"next\", <https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=30>; rel=\"last\""
+    }
+  },
+  "uuid": "c94d389f-b7f3-4c5f-9de7-0f2fdfb617cb",
+  "persistent": true,
+  "scenarioName": "scenario-1-search-commits",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-search-commits-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33-44b5b3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33-44b5b3.json
deleted file mode 100644
index be29427067..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33-44b5b3.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "44b5b3a8-cb76-4cd7-8b0f-762f81037dac",
-  "name": "search_commits",
-  "request": {
-    "url": "/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.cloak-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_commits-44b5b3a8-cb76-4cd7-8b0f-762f81037dac.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "28",
-      "X-RateLimit-Reset": "1582338261",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.cloak-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB202:724B72:5E50909F",
-      "Link": "<https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=2>; rel=\"next\", <https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=30>; rel=\"last\""
-    }
-  },
-  "uuid": "44b5b3a8-cb76-4cd7-8b0f-762f81037dac",
-  "persistent": true,
-  "scenarioName": "scenario-1-search-commits",
-  "requiredScenarioState": "scenario-1-search-commits-2",
-  "insertionIndex": 33
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33.json
new file mode 100644
index 0000000000..c4931c4bb8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/search_commits-33.json
@@ -0,0 +1,46 @@
+{
+  "id": "44b5b3a8-cb76-4cd7-8b0f-762f81037dac",
+  "name": "search_commits",
+  "request": {
+    "url": "/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.cloak-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_commits-33.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "28",
+      "X-RateLimit-Reset": "1582338261",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.cloak-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB202:724B72:5E50909F",
+      "Link": "<https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=2>; rel=\"next\", <https://api.github.com/search/commits?sort=committer-date&q=org%3Agithub-api+repo%3Agithub-api+author%3Akohsuke&page=30>; rel=\"last\""
+    }
+  },
+  "uuid": "44b5b3a8-cb76-4cd7-8b0f-762f81037dac",
+  "persistent": true,
+  "scenarioName": "scenario-1-search-commits",
+  "requiredScenarioState": "scenario-1-search-commits-2",
+  "insertionIndex": 33
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1-726152.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1-726152.json
deleted file mode 100644
index abfb132492..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1-726152.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "726152f6-effe-47f0-b092-29d86ff46ef5",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-726152f6-effe-47f0-b092-29d86ff46ef5.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:23:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EBD8:0A38:5FB0A0:7249BB:5E509098"
-    }
-  },
-  "uuid": "726152f6-effe-47f0-b092-29d86ff46ef5",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1.json
new file mode 100644
index 0000000000..b308a97449
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitSearch/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "726152f6-effe-47f0-b092-29d86ff46ef5",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:23:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EBD8:0A38:5FB0A0:7249BB:5E509098"
+    }
+  },
+  "uuid": "726152f6-effe-47f0-b092-29d86ff46ef5",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3-d76abe.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3-d76abe.json
deleted file mode 100644
index 3aa0bb8598..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f23",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json
new file mode 100644
index 0000000000..ac167941c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f23",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f23-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitShortInfo/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api-b3932679-d938-421c-83c8-321c611cda12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api-b3932679-d938-421c-83c8-321c611cda12.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-6fad91ab-a75a-4968-b2cf-9b6edd71ee36.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-6fad91ab-a75a-4968-b2cf-9b6edd71ee36.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/user-83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/user-83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2-b39326.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2-b39326.json
deleted file mode 100644
index 71d433916a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2-b39326.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b3932679-d938-421c-83c8-321c611cda12",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-b3932679-d938-421c-83c8-321c611cda12.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4322",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE1:45A4:C1463C:DF1120:5DB3A142"
-    }
-  },
-  "uuid": "b3932679-d938-421c-83c8-321c611cda12",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..b9b0d21050
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b3932679-d938-421c-83c8-321c611cda12",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4322",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE1:45A4:C1463C:DF1120:5DB3A142"
+    }
+  },
+  "uuid": "b3932679-d938-421c-83c8-321c611cda12",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3-6fad91.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3-6fad91.json
deleted file mode 100644
index 8de81727f3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3-6fad91.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "6fad91ab-a75a-4968-b2cf-9b6edd71ee36",
-  "name": "repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396",
-  "request": {
-    "url": "/repos/github-api/github-api/statuses/ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-6fad91ab-a75a-4968-b2cf-9b6edd71ee36.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4321",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9b40186e3eec6147394ae5898f0f021f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, repo:status",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE1:45A4:C1465A:DF1160:5DB3A142"
-    }
-  },
-  "uuid": "6fad91ab-a75a-4968-b2cf-9b6edd71ee36",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json
new file mode 100644
index 0000000000..7293f10e74
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "6fad91ab-a75a-4968-b2cf-9b6edd71ee36",
+  "name": "repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396",
+  "request": {
+    "url": "/repos/github-api/github-api/statuses/ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_statuses_ecbfdd7315ef2cf04b2be7f11a072ce0bd00c396-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4321",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9b40186e3eec6147394ae5898f0f021f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, repo:status",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE1:45A4:C1465A:DF1160:5DB3A142"
+    }
+  },
+  "uuid": "6fad91ab-a75a-4968-b2cf-9b6edd71ee36",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1-83b4bb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1-83b4bb.json
deleted file mode 100644
index 46cb84d6f6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1-83b4bb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4324",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE1:45A4:C14616:DF1117:5DB3A142"
-    }
-  },
-  "uuid": "83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1.json
new file mode 100644
index 0000000000..6e6e3af592
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCommitStatus/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4324",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE1:45A4:C14616:DF1117:5DB3A142"
+    }
+  },
+  "uuid": "83b4bb7c-8af2-4ece-8e5a-c1a1f8e557e4",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test-31a86a0d-5120-47b8-a9bc-ec4b34a08080.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test-31a86a0d-5120-47b8-a9bc-ec4b34a08080.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-702b7123-86c1-41e0-bee7-f3cb89a3236d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-702b7123-86c1-41e0-bee7-f3cb89a3236d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-b4bcdadb-a708-4509-9382-479f300eb172.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-b4bcdadb-a708-4509-9382-479f300eb172.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/repos_github-api-test-org_github-api-test_deployments-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/user-6d2dcbf4-4abf-4180-9b55-ca2931ca31c5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/user-6d2dcbf4-4abf-4180-9b55-ca2931ca31c5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2-31a86a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2-31a86a.json
deleted file mode 100644
index 1065e0c5a6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2-31a86a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "31a86a0d-5120-47b8-a9bc-ec4b34a08080",
-  "name": "repos_github-api-test-org_github-api-test",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-test-31a86a0d-5120-47b8-a9bc-ec4b34a08080.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4750",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"65ee4cf55cf4d084267c80a5d39244c6\"",
-      "Last-Modified": "Thu, 03 Oct 2019 18:57:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3AD:3618:10E8DB:149FB6:5D9644B0"
-    }
-  },
-  "uuid": "31a86a0d-5120-47b8-a9bc-ec4b34a08080",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2.json
new file mode 100644
index 0000000000..b2fbe6ee33
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "31a86a0d-5120-47b8-a9bc-ec4b34a08080",
+  "name": "repos_github-api-test-org_github-api-test",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-test-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4750",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"65ee4cf55cf4d084267c80a5d39244c6\"",
+      "Last-Modified": "Thu, 03 Oct 2019 18:57:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3AD:3618:10E8DB:149FB6:5D9644B0"
+    }
+  },
+  "uuid": "31a86a0d-5120-47b8-a9bc-ec4b34a08080",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3-702b71.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3-702b71.json
deleted file mode 100644
index b1918356d6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3-702b71.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "id": "702b7123-86c1-41e0-bee7-f3cb89a3236d",
-  "name": "repos_github-api-test-org_github-api-test_deployments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/deployments",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"ref\":\"master\",\"environment\":\"unittest\",\"payload\":\"{\\\"user\\\":\\\"atmos\\\",\\\"room_id\\\":123456}\",\"description\":\"question\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_deployments-702b7123-86c1-41e0-bee7-f3cb89a3236d.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4749",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"c76b22eae3a1d091db2c789a39fecda9\"",
-      "Last-Modified": "Thu, 03 Oct 2019 18:57:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/deployments/173089055",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3AD:3618:10E8DF:149FEF:5D9644B5"
-    }
-  },
-  "uuid": "702b7123-86c1-41e0-bee7-f3cb89a3236d",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3.json
new file mode 100644
index 0000000000..e80bd5c502
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-3.json
@@ -0,0 +1,56 @@
+{
+  "id": "702b7123-86c1-41e0-bee7-f3cb89a3236d",
+  "name": "repos_github-api-test-org_github-api-test_deployments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/deployments",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"ref\":\"master\",\"environment\":\"unittest\",\"payload\":\"{\\\"user\\\":\\\"atmos\\\",\\\"room_id\\\":123456}\",\"description\":\"question\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_deployments-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4749",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"c76b22eae3a1d091db2c789a39fecda9\"",
+      "Last-Modified": "Thu, 03 Oct 2019 18:57:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/deployments/173089055",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3AD:3618:10E8DF:149FEF:5D9644B5"
+    }
+  },
+  "uuid": "702b7123-86c1-41e0-bee7-f3cb89a3236d",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4-b4bcda.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4-b4bcda.json
deleted file mode 100644
index 2dd3cea01f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4-b4bcda.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "b4bcdadb-a708-4509-9382-479f300eb172",
-  "name": "repos_github-api-test-org_github-api-test_deployments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/deployments?ref=master&environment=unittest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_deployments-b4bcdadb-a708-4509-9382-479f300eb172.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4748",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b47f03577f96c1081341944009009f7f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, repo_deployment",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3AD:3618:10E8E2:149FF2:5D9644B5"
-    }
-  },
-  "uuid": "b4bcdadb-a708-4509-9382-479f300eb172",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4.json
new file mode 100644
index 0000000000..74d56e9c5a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/repos_github-api-test-org_github-api-test_deployments-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "b4bcdadb-a708-4509-9382-479f300eb172",
+  "name": "repos_github-api-test-org_github-api-test_deployments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/deployments?ref=master&environment=unittest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_deployments-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4748",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b47f03577f96c1081341944009009f7f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, repo_deployment",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3AD:3618:10E8E2:149FF2:5D9644B5"
+    }
+  },
+  "uuid": "b4bcdadb-a708-4509-9382-479f300eb172",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1-6d2dcb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1-6d2dcb.json
deleted file mode 100644
index 2a21bf42ec..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1-6d2dcb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6d2dcbf4-4abf-4180-9b55-ca2931ca31c5",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-6d2dcbf4-4abf-4180-9b55-ca2931ca31c5.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:52 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4759",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3AD:3618:10E8AA:149FB4:5D9644B0"
-    }
-  },
-  "uuid": "6d2dcbf4-4abf-4180-9b55-ca2931ca31c5",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1.json
new file mode 100644
index 0000000000..39a1ca7333
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateAndListDeployments/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "6d2dcbf4-4abf-4180-9b55-ca2931ca31c5",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:52 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4759",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3AD:3618:10E8AA:149FB4:5D9644B0"
+    }
+  },
+  "uuid": "6d2dcbf4-4abf-4180-9b55-ca2931ca31c5",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant-3fd5d206-9d71-4f2a-bc95-605c06b6f793.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant-3fd5d206-9d71-4f2a-bc95-605c06b6f793.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_comments_35673784-70a63f41-02d3-404e-af0b-8e1c3cd00494.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_comments_35673784-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_comments_35673784-70a63f41-02d3-404e-af0b-8e1c3cd00494.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_comments_35673784-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-d1822d1b-5505-42ae-ba1d-ae0496d76c19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-d1822d1b-5505-42ae-ba1d-ae0496d76c19.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-62d11eb1-6045-42a7-988a-aae9d9f3800b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-62d11eb1-6045-42a7-988a-aae9d9f3800b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/user-a9b48b44-c9ff-4434-9f98-64195b0c46ce.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/user-a9b48b44-c9ff-4434-9f98-64195b0c46ce.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/users_kohsuke-a4924f94-0b1c-4cb0-bf1f-595ccb78aa41.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/users_kohsuke-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/users_kohsuke-a4924f94-0b1c-4cb0-bf1f-595ccb78aa41.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/__files/users_kohsuke-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3-3fd5d2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3-3fd5d2.json
deleted file mode 100644
index f3308db93c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3-3fd5d2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3fd5d206-9d71-4f2a-bc95-605c06b6f793",
-  "name": "repos_kohsuke_sandbox-ant",
-  "request": {
-    "url": "/repos/kohsuke/sandbox-ant",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_sandbox-ant-3fd5d206-9d71-4f2a-bc95-605c06b6f793.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4242",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6d4495f0d482e4612ed1964d37884bce\"",
-      "Last-Modified": "Tue, 13 Aug 2019 14:56:58 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB24:8340:ED2364:116FE52:5DB3A15A"
-    }
-  },
-  "uuid": "3fd5d206-9d71-4f2a-bc95-605c06b6f793",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3.json
new file mode 100644
index 0000000000..573b1de196
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "3fd5d206-9d71-4f2a-bc95-605c06b6f793",
+  "name": "repos_kohsuke_sandbox-ant",
+  "request": {
+    "url": "/repos/kohsuke/sandbox-ant",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_sandbox-ant-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4242",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6d4495f0d482e4612ed1964d37884bce\"",
+      "Last-Modified": "Tue, 13 Aug 2019 14:56:58 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB24:8340:ED2364:116FE52:5DB3A15A"
+    }
+  },
+  "uuid": "3fd5d206-9d71-4f2a-bc95-605c06b6f793",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6-70a63f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6-70a63f.json
deleted file mode 100644
index 13acaa6288..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6-70a63f.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "70a63f41-02d3-404e-af0b-8e1c3cd00494",
-  "name": "repos_kohsuke_sandbox-ant_comments_35673784",
-  "request": {
-    "url": "/repos/kohsuke/sandbox-ant/comments/35673784",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"body\":\"updated text\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_sandbox-ant_comments_35673784-70a63f41-02d3-404e-af0b-8e1c3cd00494.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4239",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e22c642208efa831e007ec061a30aae3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB24:8340:ED23BA:116FEBA:5DB3A15B"
-    }
-  },
-  "uuid": "70a63f41-02d3-404e-af0b-8e1c3cd00494",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6.json
new file mode 100644
index 0000000000..b72ff1a14e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-6.json
@@ -0,0 +1,54 @@
+{
+  "id": "70a63f41-02d3-404e-af0b-8e1c3cd00494",
+  "name": "repos_kohsuke_sandbox-ant_comments_35673784",
+  "request": {
+    "url": "/repos/kohsuke/sandbox-ant/comments/35673784",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"body\":\"updated text\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_sandbox-ant_comments_35673784-6.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4239",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e22c642208efa831e007ec061a30aae3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB24:8340:ED23BA:116FEBA:5DB3A15B"
+    }
+  },
+  "uuid": "70a63f41-02d3-404e-af0b-8e1c3cd00494",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-7-1e9db3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-7-1e9db3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_comments_35673784-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4-d1822d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4-d1822d.json
deleted file mode 100644
index b1012d5569..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4-d1822d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d1822d1b-5505-42ae-ba1d-ae0496d76c19",
-  "name": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000",
-  "request": {
-    "url": "/repos/kohsuke/sandbox-ant/commits/8ae38db0ea5837313ab5f39d43a6f73de3bd9000",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-d1822d1b-5505-42ae-ba1d-ae0496d76c19.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4241",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f7ff477379d3449f082c148579824d0f\"",
-      "Last-Modified": "Tue, 24 Apr 2012 22:54:20 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB24:8340:ED2375:116FE66:5DB3A15A"
-    }
-  },
-  "uuid": "d1822d1b-5505-42ae-ba1d-ae0496d76c19",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json
new file mode 100644
index 0000000000..d0d9292946
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "d1822d1b-5505-42ae-ba1d-ae0496d76c19",
+  "name": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000",
+  "request": {
+    "url": "/repos/kohsuke/sandbox-ant/commits/8ae38db0ea5837313ab5f39d43a6f73de3bd9000",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4241",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f7ff477379d3449f082c148579824d0f\"",
+      "Last-Modified": "Tue, 24 Apr 2012 22:54:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB24:8340:ED2375:116FE66:5DB3A15A"
+    }
+  },
+  "uuid": "d1822d1b-5505-42ae-ba1d-ae0496d76c19",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5-62d11e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5-62d11e.json
deleted file mode 100644
index 4fa877672b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5-62d11e.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "62d11eb1-6045-42a7-988a-aae9d9f3800b",
-  "name": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments",
-  "request": {
-    "url": "/repos/kohsuke/sandbox-ant/commits/8ae38db0ea5837313ab5f39d43a6f73de3bd9000/comments",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"body\":\"[testing](http://kohsuse.org/)\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-62d11eb1-6045-42a7-988a-aae9d9f3800b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4240",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"1ebfc3d7a9cbe1bfbab78c1636ef102a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/kohsuke/sandbox-ant/comments/35673784",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB24:8340:ED2399:116FE83:5DB3A15A"
-    }
-  },
-  "uuid": "62d11eb1-6045-42a7-988a-aae9d9f3800b",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json
new file mode 100644
index 0000000000..3cab449207
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "62d11eb1-6045-42a7-988a-aae9d9f3800b",
+  "name": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments",
+  "request": {
+    "url": "/repos/kohsuke/sandbox-ant/commits/8ae38db0ea5837313ab5f39d43a6f73de3bd9000/comments",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"body\":\"[testing](http://kohsuse.org/)\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_kohsuke_sandbox-ant_commits_8ae38db0ea5837313ab5f39d43a6f73de3bd9000_comments-5.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4240",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"1ebfc3d7a9cbe1bfbab78c1636ef102a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/kohsuke/sandbox-ant/comments/35673784",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB24:8340:ED2399:116FE83:5DB3A15A"
+    }
+  },
+  "uuid": "62d11eb1-6045-42a7-988a-aae9d9f3800b",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1-a9b48b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1-a9b48b.json
deleted file mode 100644
index 3c02c76fd4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1-a9b48b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a9b48b44-c9ff-4434-9f98-64195b0c46ce",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a9b48b44-c9ff-4434-9f98-64195b0c46ce.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4245",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB24:8340:ED234A:116FE30:5DB3A15A"
-    }
-  },
-  "uuid": "a9b48b44-c9ff-4434-9f98-64195b0c46ce",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1.json
new file mode 100644
index 0000000000..8e940d9535
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a9b48b44-c9ff-4434-9f98-64195b0c46ce",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4245",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB24:8340:ED234A:116FE30:5DB3A15A"
+    }
+  },
+  "uuid": "a9b48b44-c9ff-4434-9f98-64195b0c46ce",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2-a4924f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2-a4924f.json
deleted file mode 100644
index fe19497fae..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2-a4924f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a4924f94-0b1c-4cb0-bf1f-595ccb78aa41",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-a4924f94-0b1c-4cb0-bf1f-595ccb78aa41.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4243",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
-      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB24:8340:ED235B:116FE3C:5DB3A15A"
-    }
-  },
-  "uuid": "a4924f94-0b1c-4cb0-bf1f-595ccb78aa41",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2.json
new file mode 100644
index 0000000000..b23f471d1b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateCommitComment/mappings/users_kohsuke-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "a4924f94-0b1c-4cb0-bf1f-595ccb78aa41",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4243",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
+      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB24:8340:ED235B:116FE3C:5DB3A15A"
+    }
+  },
+  "uuid": "a4924f94-0b1c-4cb0-bf1f-595ccb78aa41",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test-2d35cecf-0212-47d5-8dd3-15b4838d56c6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test-2d35cecf-0212-47d5-8dd3-15b4838d56c6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues-4c0eec6b-2118-4a14-8a95-3e55fd260384.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues-4c0eec6b-2118-4a14-8a95-3e55fd260384.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues_1-b2b352de-1dfc-4bbf-8b29-6699c09adcba.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues_1-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues_1-b2b352de-1dfc-4bbf-8b29-6699c09adcba.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_issues_1-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-9f6e9872-cdec-405b-a820-838d4a40ab00.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-9f6e9872-cdec-405b-a820-838d4a40ab00.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-c528f3b4-7651-4943-8247-fc4eb960f7c7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-c528f3b4-7651-4943-8247-fc4eb960f7c7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/repos_github-api-test-org_github-api-test_milestones-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/user-8104cc51-7147-4bc3-9004-2cec25e972f8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/user-8104cc51-7147-4bc3-9004-2cec25e972f8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2-2d35ce.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2-2d35ce.json
deleted file mode 100644
index 0a7a2bfc11..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2-2d35ce.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2d35cecf-0212-47d5-8dd3-15b4838d56c6",
-  "name": "repos_github-api-test-org_github-api-test",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-test-2d35cecf-0212-47d5-8dd3-15b4838d56c6.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4956",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5808cf093e2e56c1894809cd197b2abc\"",
-      "Last-Modified": "Wed, 02 Oct 2019 19:25:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2C1:361D:9BDE30:B8EDBE:5D95192F"
-    }
-  },
-  "uuid": "2d35cecf-0212-47d5-8dd3-15b4838d56c6",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2.json
new file mode 100644
index 0000000000..7000bac968
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "2d35cecf-0212-47d5-8dd3-15b4838d56c6",
+  "name": "repos_github-api-test-org_github-api-test",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-test-2.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5808cf093e2e56c1894809cd197b2abc\"",
+      "Last-Modified": "Wed, 02 Oct 2019 19:25:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2C1:361D:9BDE30:B8EDBE:5D95192F"
+    }
+  },
+  "uuid": "2d35cecf-0212-47d5-8dd3-15b4838d56c6",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-4-0765fd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-4-0765fd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-5-9f3310.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-5-9f3310.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-7-3dddac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-7-3dddac.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-8-8cfab8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-8-8cfab8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_hooks-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10-4c0eec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10-4c0eec.json
deleted file mode 100644
index 3b61ecc0f6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10-4c0eec.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "4c0eec6b-2118-4a14-8a95-3e55fd260384",
-  "name": "repos_github-api-test-org_github-api-test_issues",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/issues",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"milestone\":1,\"assignees\":[\"bitwiseman\"],\"title\":\"testing\",\"body\":\"this is body\",\"labels\":[\"bug\",\"question\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_issues-4c0eec6b-2118-4a14-8a95-3e55fd260384.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 22:04:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4856",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"da80c0ddf30a92e2f67e99710e305521\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/issues/1",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C7C8:67D5:8932C5:A52738:5D951EDD"
-    }
-  },
-  "uuid": "4c0eec6b-2118-4a14-8a95-3e55fd260384",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10.json
new file mode 100644
index 0000000000..5fa7fcc479
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues-10.json
@@ -0,0 +1,55 @@
+{
+  "id": "4c0eec6b-2118-4a14-8a95-3e55fd260384",
+  "name": "repos_github-api-test-org_github-api-test_issues",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/issues",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"milestone\":1,\"assignees\":[\"bitwiseman\"],\"title\":\"testing\",\"body\":\"this is body\",\"labels\":[\"bug\",\"question\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_issues-10.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 22:04:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4856",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"da80c0ddf30a92e2f67e99710e305521\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/issues/1",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C7C8:67D5:8932C5:A52738:5D951EDD"
+    }
+  },
+  "uuid": "4c0eec6b-2118-4a14-8a95-3e55fd260384",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11-b2b352.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11-b2b352.json
deleted file mode 100644
index 680130a92e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11-b2b352.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "b2b352de-1dfc-4bbf-8b29-6699c09adcba",
-  "name": "repos_github-api-test-org_github-api-test_issues_1",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/issues/1",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_issues_1-b2b352de-1dfc-4bbf-8b29-6699c09adcba.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 22:04:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4855",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c747dbe6b23b7df1b44abcdf422594da\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C7C8:67D5:893322:A527A2:5D951EDE"
-    }
-  },
-  "uuid": "b2b352de-1dfc-4bbf-8b29-6699c09adcba",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11.json
new file mode 100644
index 0000000000..6b0f43c7ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_issues_1-11.json
@@ -0,0 +1,54 @@
+{
+  "id": "b2b352de-1dfc-4bbf-8b29-6699c09adcba",
+  "name": "repos_github-api-test-org_github-api-test_issues_1",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/issues/1",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_issues_1-11.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 22:04:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4855",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c747dbe6b23b7df1b44abcdf422594da\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C7C8:67D5:893322:A527A2:5D951EDE"
+    }
+  },
+  "uuid": "b2b352de-1dfc-4bbf-8b29-6699c09adcba",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12-9f6e98.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12-9f6e98.json
deleted file mode 100644
index 4fd3afdc4a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12-9f6e98.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "9f6e9872-cdec-405b-a820-838d4a40ab00",
-  "name": "repos_github-api-test-org_github-api-test_milestones",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/milestones",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"Test Milestone\",\"title\":\"Test Milestone Title3\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_milestones-9f6e9872-cdec-405b-a820-838d4a40ab00.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 22:04:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4847",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"c7e702bb14033f392f15666e3c20f786\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/milestones/1",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C7E2:2CE7:A1D690:BEC182:5D951F03"
-    }
-  },
-  "uuid": "9f6e9872-cdec-405b-a820-838d4a40ab00",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12.json
new file mode 100644
index 0000000000..fb30618b7c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-12.json
@@ -0,0 +1,55 @@
+{
+  "id": "9f6e9872-cdec-405b-a820-838d4a40ab00",
+  "name": "repos_github-api-test-org_github-api-test_milestones",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/milestones",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"Test Milestone\",\"title\":\"Test Milestone Title3\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_milestones-12.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 22:04:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4847",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"c7e702bb14033f392f15666e3c20f786\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/milestones/1",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C7E2:2CE7:A1D690:BEC182:5D951F03"
+    }
+  },
+  "uuid": "9f6e9872-cdec-405b-a820-838d4a40ab00",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-3-7cb4f1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-3-7cb4f1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-6-9a91aa.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-6-9a91aa.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9-c528f3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9-c528f3.json
deleted file mode 100644
index f009c4522f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9-c528f3.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "c528f3b4-7651-4943-8247-fc4eb960f7c7",
-  "name": "repos_github-api-test-org_github-api-test_milestones",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/milestones",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"Test Milestone\",\"title\":\"Test Milestone Title2\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_milestones-c528f3b4-7651-4943-8247-fc4eb960f7c7.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 22:04:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4857",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"b35242ca101f84f1be21e1508b9851a3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/milestones/1",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C7C8:67D5:8932AC:A5271D:5D951EDC"
-    }
-  },
-  "uuid": "c528f3b4-7651-4943-8247-fc4eb960f7c7",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9.json
new file mode 100644
index 0000000000..94028cbe35
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/repos_github-api-test-org_github-api-test_milestones-9.json
@@ -0,0 +1,55 @@
+{
+  "id": "c528f3b4-7651-4943-8247-fc4eb960f7c7",
+  "name": "repos_github-api-test-org_github-api-test_milestones",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/milestones",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"Test Milestone\",\"title\":\"Test Milestone Title2\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_milestones-9.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 22:04:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4857",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"b35242ca101f84f1be21e1508b9851a3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test/milestones/1",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C7C8:67D5:8932AC:A5271D:5D951EDC"
+    }
+  },
+  "uuid": "c528f3b4-7651-4943-8247-fc4eb960f7c7",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1-8104cc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1-8104cc.json
deleted file mode 100644
index 99d7cc39b5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1-8104cc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8104cc51-7147-4bc3-9004-2cec25e972f8",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8104cc51-7147-4bc3-9004-2cec25e972f8.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4958",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2C1:361D:9BDE00:B8EDB3:5D95192F"
-    }
-  },
-  "uuid": "8104cc51-7147-4bc3-9004-2cec25e972f8",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1.json
new file mode 100644
index 0000000000..569a63b6c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCreateIssue/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8104cc51-7147-4bc3-9004-2cec25e972f8",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4958",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2C1:361D:9BDE00:B8EDB3:5D95192F"
+    }
+  },
+  "uuid": "8104cc51-7147-4bc3-9004-2cec25e972f8",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/__files/user-eba96b24-3354-4d21-bd2a-388a13ba9832.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/__files/user-eba96b24-3354-4d21-bd2a-388a13ba9832.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1-eba96b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1-eba96b.json
deleted file mode 100644
index 0d8706d89e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1-eba96b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "eba96b24-3354-4d21-bd2a-388a13ba9832",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-eba96b24-3354-4d21-bd2a-388a13ba9832.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2BA:67D6:CA2979:EFEEDC:5D95192D"
-    }
-  },
-  "uuid": "eba96b24-3354-4d21-bd2a-388a13ba9832",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1.json
new file mode 100644
index 0000000000..b64c18404e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testCredentialValid/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "eba96b24-3354-4d21-bd2a-388a13ba9832",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2BA:67D6:CA2979:EFEEDC:5D95192D"
+    }
+  },
+  "uuid": "eba96b24-3354-4d21-bd2a-388a13ba9832",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-3894ddd2-ac57-4592-bc01-9e5d7f93ef6e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-3894ddd2-ac57-4592-bc01-9e5d7f93ef6e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-d66da82e-6a4f-496f-824c-53e4db13d18a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-d66da82e-6a4f-496f-824c-53e4db13d18a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-79407878-4e6c-4d87-a3b7-f2d003b89d91.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-79407878-4e6c-4d87-a3b7-f2d003b89d91.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-d3ce344a-2eeb-443b-9929-612fb9cbde1f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-d3ce344a-2eeb-443b-9929-612fb9cbde1f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-5d107ab6-f41e-41dd-b699-ed83c6edbceb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-5d107ab6-f41e-41dd-b699-ed83c6edbceb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-6f4a1d77-46f9-4f38-a260-953487c97b4f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-6f4a1d77-46f9-4f38-a260-953487c97b4f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-6354ffb5-fa83-474c-94ea-f91ca33f5a71.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-6354ffb5-fa83-474c-94ea-f91ca33f5a71.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-3719d162-a479-4a4c-803c-6747e224509c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-3719d162-a479-4a4c-803c-6747e224509c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-98288433-46b1-4ad0-9857-c44ae6ac3182.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-98288433-46b1-4ad0-9857-c44ae6ac3182.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/events-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/user-01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/user-01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10-3894dd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10-3894dd.json
deleted file mode 100644
index a5bd981300..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10-3894dd.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "3894ddd2-ac57-4592-bc01-9e5d7f93ef6e",
-  "name": "events",
-  "request": {
-    "url": "/events?page=9",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-3894ddd2-ac57-4592-bc01-9e5d7f93ef6e.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4965",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5862dd7d98ddfdeb9133b8e16856b0d0\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:48 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAF5B:104D1B:5DAE2A5C",
-      "Link": "<https://api.github.com/events?page=8>; rel=\"prev\", <https://api.github.com/events?page=10>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "3894ddd2-ac57-4592-bc01-9e5d7f93ef6e",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10.json
new file mode 100644
index 0000000000..f843ba608a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-10.json
@@ -0,0 +1,50 @@
+{
+  "id": "3894ddd2-ac57-4592-bc01-9e5d7f93ef6e",
+  "name": "events",
+  "request": {
+    "url": "/events?page=9",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-10.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4965",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5862dd7d98ddfdeb9133b8e16856b0d0\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:48 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAF5B:104D1B:5DAE2A5C",
+      "Link": "<https://api.github.com/events?page=8>; rel=\"prev\", <https://api.github.com/events?page=10>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "3894ddd2-ac57-4592-bc01-9e5d7f93ef6e",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11-1f4bc3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11-1f4bc3.json
deleted file mode 100644
index 9ae6b0168a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11-1f4bc3.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d",
-  "name": "events",
-  "request": {
-    "url": "/events?page=10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"914cf40313b71893255259a65b717261\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:47 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAF81:104D4B:5DAE2A5C",
-      "Link": "<https://api.github.com/events?page=9>; rel=\"prev\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11.json
new file mode 100644
index 0000000000..ea223419cd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-11.json
@@ -0,0 +1,50 @@
+{
+  "id": "1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d",
+  "name": "events",
+  "request": {
+    "url": "/events?page=10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-11.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"914cf40313b71893255259a65b717261\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:47 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAF81:104D4B:5DAE2A5C",
+      "Link": "<https://api.github.com/events?page=9>; rel=\"prev\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1f4bc3c9-b53c-4cab-ba72-bf9eaea1dc2d",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2-d66da8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2-d66da8.json
deleted file mode 100644
index 547d0144d7..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2-d66da8.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "d66da82e-6a4f-496f-824c-53e4db13d18a",
-  "name": "events",
-  "request": {
-    "url": "/events",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-d66da82e-6a4f-496f-824c-53e4db13d18a.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:52 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"01eb5d170ab95e151979e070a49611c2\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:52 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAD3B:104A5B:5DAE2A57",
-      "Link": "<https://api.github.com/events?page=2>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\""
-    }
-  },
-  "uuid": "d66da82e-6a4f-496f-824c-53e4db13d18a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2.json
new file mode 100644
index 0000000000..db68019011
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-2.json
@@ -0,0 +1,50 @@
+{
+  "id": "d66da82e-6a4f-496f-824c-53e4db13d18a",
+  "name": "events",
+  "request": {
+    "url": "/events",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-2.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:52 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"01eb5d170ab95e151979e070a49611c2\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:52 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAD3B:104A5B:5DAE2A57",
+      "Link": "<https://api.github.com/events?page=2>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\""
+    }
+  },
+  "uuid": "d66da82e-6a4f-496f-824c-53e4db13d18a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3-d3ce34.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3-d3ce34.json
deleted file mode 100644
index 2c4940c31c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3-d3ce34.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "d3ce344a-2eeb-443b-9929-612fb9cbde1f",
-  "name": "events",
-  "request": {
-    "url": "/events?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-d3ce344a-2eeb-443b-9929-612fb9cbde1f.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cc64ac435b4e3533e2725cb902c726c4\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:51 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAD77:104AD3:5DAE2A58",
-      "Link": "<https://api.github.com/events?page=1>; rel=\"prev\", <https://api.github.com/events?page=3>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d3ce344a-2eeb-443b-9929-612fb9cbde1f",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3.json
new file mode 100644
index 0000000000..d37aec05d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "d3ce344a-2eeb-443b-9929-612fb9cbde1f",
+  "name": "events",
+  "request": {
+    "url": "/events?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-3.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cc64ac435b4e3533e2725cb902c726c4\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:51 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAD77:104AD3:5DAE2A58",
+      "Link": "<https://api.github.com/events?page=1>; rel=\"prev\", <https://api.github.com/events?page=3>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d3ce344a-2eeb-443b-9929-612fb9cbde1f",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4-794078.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4-794078.json
deleted file mode 100644
index cdf4827c9f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4-794078.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "79407878-4e6c-4d87-a3b7-f2d003b89d91",
-  "name": "events",
-  "request": {
-    "url": "/events?page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-79407878-4e6c-4d87-a3b7-f2d003b89d91.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cc64ac435b4e3533e2725cb902c726c4\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:51 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DADCC:104B31:5DAE2A59",
-      "Link": "<https://api.github.com/events?page=2>; rel=\"prev\", <https://api.github.com/events?page=4>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "79407878-4e6c-4d87-a3b7-f2d003b89d91",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4.json
new file mode 100644
index 0000000000..724520f0b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-4.json
@@ -0,0 +1,50 @@
+{
+  "id": "79407878-4e6c-4d87-a3b7-f2d003b89d91",
+  "name": "events",
+  "request": {
+    "url": "/events?page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-4.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cc64ac435b4e3533e2725cb902c726c4\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:51 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DADCC:104B31:5DAE2A59",
+      "Link": "<https://api.github.com/events?page=2>; rel=\"prev\", <https://api.github.com/events?page=4>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "79407878-4e6c-4d87-a3b7-f2d003b89d91",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5-5d107a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5-5d107a.json
deleted file mode 100644
index cae74dfee7..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5-5d107a.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "5d107ab6-f41e-41dd-b699-ed83c6edbceb",
-  "name": "events",
-  "request": {
-    "url": "/events?page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-5d107ab6-f41e-41dd-b699-ed83c6edbceb.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ca3ad424754364911e4fe844de396c08\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:50 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAE18:104B7E:5DAE2A59",
-      "Link": "<https://api.github.com/events?page=3>; rel=\"prev\", <https://api.github.com/events?page=5>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "5d107ab6-f41e-41dd-b699-ed83c6edbceb",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5.json
new file mode 100644
index 0000000000..d8c4e28ff7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-5.json
@@ -0,0 +1,50 @@
+{
+  "id": "5d107ab6-f41e-41dd-b699-ed83c6edbceb",
+  "name": "events",
+  "request": {
+    "url": "/events?page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-5.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ca3ad424754364911e4fe844de396c08\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:50 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAE18:104B7E:5DAE2A59",
+      "Link": "<https://api.github.com/events?page=3>; rel=\"prev\", <https://api.github.com/events?page=5>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "5d107ab6-f41e-41dd-b699-ed83c6edbceb",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6-6f4a1d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6-6f4a1d.json
deleted file mode 100644
index 91454cdbd4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6-6f4a1d.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "6f4a1d77-46f9-4f38-a260-953487c97b4f",
-  "name": "events",
-  "request": {
-    "url": "/events?page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-6f4a1d77-46f9-4f38-a260-953487c97b4f.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4969",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"30b3c980ec502ed60846aedb00322d78\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:51 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAE55:104BE5:5DAE2A5A",
-      "Link": "<https://api.github.com/events?page=4>; rel=\"prev\", <https://api.github.com/events?page=6>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6f4a1d77-46f9-4f38-a260-953487c97b4f",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6.json
new file mode 100644
index 0000000000..f023a8a9d2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-6.json
@@ -0,0 +1,50 @@
+{
+  "id": "6f4a1d77-46f9-4f38-a260-953487c97b4f",
+  "name": "events",
+  "request": {
+    "url": "/events?page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-6.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4969",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"30b3c980ec502ed60846aedb00322d78\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:51 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAE55:104BE5:5DAE2A5A",
+      "Link": "<https://api.github.com/events?page=4>; rel=\"prev\", <https://api.github.com/events?page=6>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6f4a1d77-46f9-4f38-a260-953487c97b4f",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7-6354ff.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7-6354ff.json
deleted file mode 100644
index a3ac7efabd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7-6354ff.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "6354ffb5-fa83-474c-94ea-f91ca33f5a71",
-  "name": "events",
-  "request": {
-    "url": "/events?page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-6354ffb5-fa83-474c-94ea-f91ca33f5a71.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"79886820d17e48d443179e2e533ff1bb\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:49 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAE93:104C31:5DAE2A5A",
-      "Link": "<https://api.github.com/events?page=5>; rel=\"prev\", <https://api.github.com/events?page=7>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6354ffb5-fa83-474c-94ea-f91ca33f5a71",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7.json
new file mode 100644
index 0000000000..3171c408c9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "6354ffb5-fa83-474c-94ea-f91ca33f5a71",
+  "name": "events",
+  "request": {
+    "url": "/events?page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-7.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"79886820d17e48d443179e2e533ff1bb\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:49 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAE93:104C31:5DAE2A5A",
+      "Link": "<https://api.github.com/events?page=5>; rel=\"prev\", <https://api.github.com/events?page=7>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6354ffb5-fa83-474c-94ea-f91ca33f5a71",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8-3719d1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8-3719d1.json
deleted file mode 100644
index 5ecd0a4c33..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8-3719d1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "3719d162-a479-4a4c-803c-6747e224509c",
-  "name": "events",
-  "request": {
-    "url": "/events?page=7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-3719d162-a479-4a4c-803c-6747e224509c.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"18f3cb6540885da24fb8a595f0a863e0\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:50 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAEF3:104C8E:5DAE2A5B",
-      "Link": "<https://api.github.com/events?page=6>; rel=\"prev\", <https://api.github.com/events?page=8>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "3719d162-a479-4a4c-803c-6747e224509c",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8.json
new file mode 100644
index 0000000000..1e7aa8e50e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-8.json
@@ -0,0 +1,50 @@
+{
+  "id": "3719d162-a479-4a4c-803c-6747e224509c",
+  "name": "events",
+  "request": {
+    "url": "/events?page=7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-8.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"18f3cb6540885da24fb8a595f0a863e0\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:50 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAEF3:104C8E:5DAE2A5B",
+      "Link": "<https://api.github.com/events?page=6>; rel=\"prev\", <https://api.github.com/events?page=8>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "3719d162-a479-4a4c-803c-6747e224509c",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9-982884.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9-982884.json
deleted file mode 100644
index 075536cc3a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9-982884.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "98288433-46b1-4ad0-9857-c44ae6ac3182",
-  "name": "events",
-  "request": {
-    "url": "/events?page=8",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "events-98288433-46b1-4ad0-9857-c44ae6ac3182.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"96693e93dd969b2007f637e182463fb4\"",
-      "Last-Modified": "Mon, 21 Oct 2019 21:54:49 GMT",
-      "X-Poll-Interval": "60",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DAF2D:104CE8:5DAE2A5B",
-      "Link": "<https://api.github.com/events?page=7>; rel=\"prev\", <https://api.github.com/events?page=9>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "98288433-46b1-4ad0-9857-c44ae6ac3182",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9.json
new file mode 100644
index 0000000000..0ffcaf4b15
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/events-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "98288433-46b1-4ad0-9857-c44ae6ac3182",
+  "name": "events",
+  "request": {
+    "url": "/events?page=8",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "events-9.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"96693e93dd969b2007f637e182463fb4\"",
+      "Last-Modified": "Mon, 21 Oct 2019 21:54:49 GMT",
+      "X-Poll-Interval": "60",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DAF2D:104CE8:5DAE2A5B",
+      "Link": "<https://api.github.com/events?page=7>; rel=\"prev\", <https://api.github.com/events?page=9>; rel=\"next\", <https://api.github.com/events?page=10>; rel=\"last\", <https://api.github.com/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "98288433-46b1-4ad0-9857-c44ae6ac3182",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1-01c5f6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1-01c5f6.json
deleted file mode 100644
index d69755b979..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1-01c5f6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 21:59:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1571698634",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b3ade9da976cfb0745abc8c0c5812c1e\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8EC:3E5C:DACD7:104A25:5DAE2A57"
-    }
-  },
-  "uuid": "01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1.json
new file mode 100644
index 0000000000..e8dd50c035
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testEventApi/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 21:59:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1571698634",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b3ade9da976cfb0745abc8c0c5812c1e\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8EC:3E5C:DACD7:104A25:5DAE2A57"
+    }
+  },
+  "uuid": "01c5f6e9-2ce9-42bf-acda-20cb8cc7bf8e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/orgs_github-api-baecb5db-6e9c-441b-8414-c8070d9bc0c2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/orgs_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/orgs_github-api-baecb5db-6e9c-441b-8414-c8070d9bc0c2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/orgs_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api-891820f6-7cd7-437a-8ec1-16c3e76c53ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api-891820f6-7cd7-437a-8ec1-16c3e76c53ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api_issues-a70d05ac-5820-4749-8318-e422f0f6eaf5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api_issues-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api_issues-a70d05ac-5820-4749-8318-e422f0f6eaf5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repos_github-api_github-api_issues-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-5a770b70-ca92-478e-8bb5-c713553ddefb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-5a770b70-ca92-478e-8bb5-c713553ddefb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-e04b8865-9ace-405a-b8d9-f8bcacb9bfa8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-e04b8865-9ace-405a-b8d9-f8bcacb9bfa8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-fe625e7c-4b31-4b30-bc77-a763a3774fdc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-fe625e7c-4b31-4b30-bc77-a763a3774fdc.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-ab269330-3eb7-4ec1-9211-ecc8d0d70701.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-ab269330-3eb7-4ec1-9211-ecc8d0d70701.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-9486f660-2139-4f84-ae0f-898d0369d061.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-9486f660-2139-4f84-ae0f-898d0369d061.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-c9e769fc-6556-4374-b397-244843a75000.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-c9e769fc-6556-4374-b397-244843a75000.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-46f0ca81-080b-419a-b494-df00573bd9aa.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-46f0ca81-080b-419a-b494-df00573bd9aa.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-7d74dc71-0c93-4a0a-8f8e-c6a71027b219.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-7d74dc71-0c93-4a0a-8f8e-c6a71027b219.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-e22232e4-eb5c-4657-b485-171936f6174e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-e22232e4-eb5c-4657-b485-171936f6174e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-d2dadb59-c855-4c32-8a98-5ed6992cf3ff.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-d2dadb59-c855-4c32-8a98-5ed6992cf3ff.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-63d2db0d-08ce-498b-8c8d-903da44e2e94.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-63d2db0d-08ce-498b-8c8d-903da44e2e94.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-e084b859-6ef7-4657-ad19-0c0b1a5f9e4d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-e084b859-6ef7-4657-ad19-0c0b1a5f9e4d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-c66e220e-9138-4ead-92fb-7e882c71b9bf.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-c66e220e-9138-4ead-92fb-7e882c71b9bf.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-ddbca5ee-6c30-447d-8667-8c29c151e6d5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-ddbca5ee-6c30-447d-8667-8c29c151e6d5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/repositories_617210_issues-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/user-7741e4f6-c93e-4760-bb92-070e61f5a475.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/user-7741e4f6-c93e-4760-bb92-070e61f5a475.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2-baecb5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2-baecb5.json
deleted file mode 100644
index 09f44c6167..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2-baecb5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "baecb5db-6e9c-441b-8414-c8070d9bc0c2",
-  "name": "orgs_github-api",
-  "request": {
-    "url": "/orgs/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-baecb5db-6e9c-441b-8414-c8070d9bc0c2.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a6ed96e50f24e7f2a58b04f0c4b657aa\"",
-      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E875:1D03B18:5D968F87"
-    }
-  },
-  "uuid": "baecb5db-6e9c-441b-8414-c8070d9bc0c2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2.json
new file mode 100644
index 0000000000..84a0a6231c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/orgs_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "baecb5db-6e9c-441b-8414-c8070d9bc0c2",
+  "name": "orgs_github-api",
+  "request": {
+    "url": "/orgs/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a6ed96e50f24e7f2a58b04f0c4b657aa\"",
+      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E875:1D03B18:5D968F87"
+    }
+  },
+  "uuid": "baecb5db-6e9c-441b-8414-c8070d9bc0c2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3-891820.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3-891820.json
deleted file mode 100644
index c170e2d396..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3-891820.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "891820f6-7cd7-437a-8ec1-16c3e76c53ec",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-891820f6-7cd7-437a-8ec1-16c3e76c53ec.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4935",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8cc495660ca67962319f24f12c386311\"",
-      "Last-Modified": "Thu, 03 Oct 2019 21:38:52 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E889:1D03B86:5D968F87"
-    }
-  },
-  "uuid": "891820f6-7cd7-437a-8ec1-16c3e76c53ec",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..f9709ff42d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "891820f6-7cd7-437a-8ec1-16c3e76c53ec",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4935",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8cc495660ca67962319f24f12c386311\"",
+      "Last-Modified": "Thu, 03 Oct 2019 21:38:52 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E889:1D03B86:5D968F87"
+    }
+  },
+  "uuid": "891820f6-7cd7-437a-8ec1-16c3e76c53ec",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4-a70d05.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4-a70d05.json
deleted file mode 100644
index 88c25318e9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4-a70d05.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a70d05ac-5820-4749-8318-e422f0f6eaf5",
-  "name": "repos_github-api_github-api_issues",
-  "request": {
-    "url": "/repos/github-api/github-api/issues?state=closed",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues-a70d05ac-5820-4749-8318-e422f0f6eaf5.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"855067f1626a8814f2a51a24a505205e\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E8DF:1D03BD4:5D968F88",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\""
-    }
-  },
-  "uuid": "a70d05ac-5820-4749-8318-e422f0f6eaf5",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4.json
new file mode 100644
index 0000000000..b8a204cfdc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repos_github-api_github-api_issues-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "a70d05ac-5820-4749-8318-e422f0f6eaf5",
+  "name": "repos_github-api_github-api_issues",
+  "request": {
+    "url": "/repos/github-api/github-api/issues?state=closed",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"855067f1626a8814f2a51a24a505205e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E8DF:1D03BD4:5D968F88",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\""
+    }
+  },
+  "uuid": "a70d05ac-5820-4749-8318-e422f0f6eaf5",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10-5a770b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10-5a770b.json
deleted file mode 100644
index f90fb9f1fe..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10-5a770b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5a770b70-ca92-478e-8bb5-c713553ddefb",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-5a770b70-ca92-478e-8bb5-c713553ddefb.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4928",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"21a365f7b4f8cdc2266c724c1edbdcc1\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EACA:1D03E31:5D968F8B",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "5a770b70-ca92-478e-8bb5-c713553ddefb",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10.json
new file mode 100644
index 0000000000..830c0c7e00
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "5a770b70-ca92-478e-8bb5-c713553ddefb",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-10.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4928",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"21a365f7b4f8cdc2266c724c1edbdcc1\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EACA:1D03E31:5D968F8B",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "5a770b70-ca92-478e-8bb5-c713553ddefb",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11-e04b88.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11-e04b88.json
deleted file mode 100644
index d1edf934aa..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11-e04b88.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e04b8865-9ace-405a-b8d9-f8bcacb9bfa8",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=8",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-e04b8865-9ace-405a-b8d9-f8bcacb9bfa8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4927",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6289958dc2a2cf6746b7d52c991da514\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EB0E:1D03E6F:5D968F8C",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e04b8865-9ace-405a-b8d9-f8bcacb9bfa8",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11.json
new file mode 100644
index 0000000000..9cd8bda4df
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "e04b8865-9ace-405a-b8d9-f8bcacb9bfa8",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=8",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-11.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4927",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6289958dc2a2cf6746b7d52c991da514\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EB0E:1D03E6F:5D968F8C",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e04b8865-9ace-405a-b8d9-f8bcacb9bfa8",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12-fe625e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12-fe625e.json
deleted file mode 100644
index 3b5f430b11..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12-fe625e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fe625e7c-4b31-4b30-bc77-a763a3774fdc",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=9",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-fe625e7c-4b31-4b30-bc77-a763a3774fdc.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4926",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"89ba1bade058980eaa351f6cbc20e34b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EB42:1D03EC2:5D968F8C",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "fe625e7c-4b31-4b30-bc77-a763a3774fdc",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12.json
new file mode 100644
index 0000000000..ce29cf6f75
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "fe625e7c-4b31-4b30-bc77-a763a3774fdc",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=9",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-12.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4926",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"89ba1bade058980eaa351f6cbc20e34b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EB42:1D03EC2:5D968F8C",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "fe625e7c-4b31-4b30-bc77-a763a3774fdc",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13-ab2693.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13-ab2693.json
deleted file mode 100644
index 09fe1ea180..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13-ab2693.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ab269330-3eb7-4ec1-9211-ecc8d0d70701",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-ab269330-3eb7-4ec1-9211-ecc8d0d70701.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4925",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0aab7458ec8b4a34267a9a02dcf45257\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EB78:1D03EFD:5D968F8D",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "ab269330-3eb7-4ec1-9211-ecc8d0d70701",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13.json
new file mode 100644
index 0000000000..1fa92928fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "ab269330-3eb7-4ec1-9211-ecc8d0d70701",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-13.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4925",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0aab7458ec8b4a34267a9a02dcf45257\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EB78:1D03EFD:5D968F8D",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "ab269330-3eb7-4ec1-9211-ecc8d0d70701",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14-9486f6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14-9486f6.json
deleted file mode 100644
index db88b7e9ad..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14-9486f6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9486f660-2139-4f84-ae0f-898d0369d061",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=11",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-9486f660-2139-4f84-ae0f-898d0369d061.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4924",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1b595e98c0433d4a7bf72b76b2651c5a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EBC5:1D03F4F:5D968F8D",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "9486f660-2139-4f84-ae0f-898d0369d061",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14.json
new file mode 100644
index 0000000000..fe9887cbbc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-14.json
@@ -0,0 +1,48 @@
+{
+  "id": "9486f660-2139-4f84-ae0f-898d0369d061",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=11",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-14.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4924",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1b595e98c0433d4a7bf72b76b2651c5a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EBC5:1D03F4F:5D968F8D",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "9486f660-2139-4f84-ae0f-898d0369d061",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15-c9e769.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15-c9e769.json
deleted file mode 100644
index da009efef3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15-c9e769.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c9e769fc-6556-4374-b397-244843a75000",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=12",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-c9e769fc-6556-4374-b397-244843a75000.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4923",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2a137f52035a2a50858378f4f431c7fa\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EC16:1D03F9E:5D968F8E",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "c9e769fc-6556-4374-b397-244843a75000",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15.json
new file mode 100644
index 0000000000..7fa7ee0492
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-15.json
@@ -0,0 +1,48 @@
+{
+  "id": "c9e769fc-6556-4374-b397-244843a75000",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=12",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-15.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4923",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2a137f52035a2a50858378f4f431c7fa\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EC16:1D03F9E:5D968F8E",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "c9e769fc-6556-4374-b397-244843a75000",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16-46f0ca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16-46f0ca.json
deleted file mode 100644
index f5ad9a2e2b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16-46f0ca.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "46f0ca81-080b-419a-b494-df00573bd9aa",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=13",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-46f0ca81-080b-419a-b494-df00573bd9aa.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fca0e2c550900871b46d35b9a7986ebd\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EC6C:1D04000:5D968F8E",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "46f0ca81-080b-419a-b494-df00573bd9aa",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16.json
new file mode 100644
index 0000000000..e2b7c95ad6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-16.json
@@ -0,0 +1,48 @@
+{
+  "id": "46f0ca81-080b-419a-b494-df00573bd9aa",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=13",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-16.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fca0e2c550900871b46d35b9a7986ebd\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EC6C:1D04000:5D968F8E",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "46f0ca81-080b-419a-b494-df00573bd9aa",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17-b2fa4e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17-b2fa4e.json
deleted file mode 100644
index 1b77a074dc..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17-b2fa4e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=14",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4921",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d913f1e895a7f1d9cec68d859ecfb154\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188ECBC:1D0405F:5D968F8F",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17.json
new file mode 100644
index 0000000000..24bfdf75fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-17.json
@@ -0,0 +1,48 @@
+{
+  "id": "b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=14",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-17.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4921",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d913f1e895a7f1d9cec68d859ecfb154\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188ECBC:1D0405F:5D968F8F",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "b2fa4ec1-c691-4d0a-a3b2-13e129aa1dea",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18-7d74dc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18-7d74dc.json
deleted file mode 100644
index 13e9b99a9e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18-7d74dc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7d74dc71-0c93-4a0a-8f8e-c6a71027b219",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=15",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-7d74dc71-0c93-4a0a-8f8e-c6a71027b219.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4920",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f48c2c1602e40e0a24b7f5f00c738816\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188ED11:1D040B9:5D968F90",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "7d74dc71-0c93-4a0a-8f8e-c6a71027b219",
-  "persistent": true,
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18.json
new file mode 100644
index 0000000000..2f89ea7318
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-18.json
@@ -0,0 +1,48 @@
+{
+  "id": "7d74dc71-0c93-4a0a-8f8e-c6a71027b219",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=15",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-18.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4920",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f48c2c1602e40e0a24b7f5f00c738816\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188ED11:1D040B9:5D968F90",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "7d74dc71-0c93-4a0a-8f8e-c6a71027b219",
+  "persistent": true,
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19-e22232.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19-e22232.json
deleted file mode 100644
index ba67d74585..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19-e22232.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e22232e4-eb5c-4657-b485-171936f6174e",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=16",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-e22232e4-eb5c-4657-b485-171936f6174e.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"78757c423cf6a3177f5faeb7baeb7dfa\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188ED67:1D0412E:5D968F90",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e22232e4-eb5c-4657-b485-171936f6174e",
-  "persistent": true,
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19.json
new file mode 100644
index 0000000000..671fb1ba95
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-19.json
@@ -0,0 +1,48 @@
+{
+  "id": "e22232e4-eb5c-4657-b485-171936f6174e",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=16",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-19.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"78757c423cf6a3177f5faeb7baeb7dfa\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188ED67:1D0412E:5D968F90",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e22232e4-eb5c-4657-b485-171936f6174e",
+  "persistent": true,
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5-d2dadb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5-d2dadb.json
deleted file mode 100644
index e559d4dc2a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5-d2dadb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d2dadb59-c855-4c32-8a98-5ed6992cf3ff",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-d2dadb59-c855-4c32-8a98-5ed6992cf3ff.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d9810c203e11e0762c09af0278a0487d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E92A:1D03C1D:5D968F88",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d2dadb59-c855-4c32-8a98-5ed6992cf3ff",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5.json
new file mode 100644
index 0000000000..3270d18392
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "d2dadb59-c855-4c32-8a98-5ed6992cf3ff",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d9810c203e11e0762c09af0278a0487d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E92A:1D03C1D:5D968F88",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d2dadb59-c855-4c32-8a98-5ed6992cf3ff",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6-63d2db.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6-63d2db.json
deleted file mode 100644
index eddf3a257f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6-63d2db.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "63d2db0d-08ce-498b-8c8d-903da44e2e94",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-63d2db0d-08ce-498b-8c8d-903da44e2e94.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a99ea4578f06e3dfebbf0f3fa7caa317\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E997:1D03C98:5D968F89",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "63d2db0d-08ce-498b-8c8d-903da44e2e94",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6.json
new file mode 100644
index 0000000000..864f43b7a3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "63d2db0d-08ce-498b-8c8d-903da44e2e94",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-6.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a99ea4578f06e3dfebbf0f3fa7caa317\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E997:1D03C98:5D968F89",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "63d2db0d-08ce-498b-8c8d-903da44e2e94",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7-e084b8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7-e084b8.json
deleted file mode 100644
index 05a496ef23..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7-e084b8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e084b859-6ef7-4657-ad19-0c0b1a5f9e4d",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-e084b859-6ef7-4657-ad19-0c0b1a5f9e4d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4931",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8bf393addf678cc6709c672bab6ff47a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E9F3:1D03D0F:5D968F8A",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e084b859-6ef7-4657-ad19-0c0b1a5f9e4d",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7.json
new file mode 100644
index 0000000000..5cbce3fc21
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "e084b859-6ef7-4657-ad19-0c0b1a5f9e4d",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-7.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8bf393addf678cc6709c672bab6ff47a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E9F3:1D03D0F:5D968F8A",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e084b859-6ef7-4657-ad19-0c0b1a5f9e4d",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8-c66e22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8-c66e22.json
deleted file mode 100644
index c4ea5ed409..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8-c66e22.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c66e220e-9138-4ead-92fb-7e882c71b9bf",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-c66e220e-9138-4ead-92fb-7e882c71b9bf.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"946f495592e92e6b57eb41cc2d83dc57\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EA3E:1D03D75:5D968F8A",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "c66e220e-9138-4ead-92fb-7e882c71b9bf",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8.json
new file mode 100644
index 0000000000..1e50eb5e02
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "c66e220e-9138-4ead-92fb-7e882c71b9bf",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-8.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"946f495592e92e6b57eb41cc2d83dc57\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EA3E:1D03D75:5D968F8A",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "c66e220e-9138-4ead-92fb-7e882c71b9bf",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9-ddbca5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9-ddbca5.json
deleted file mode 100644
index 1337b1d291..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9-ddbca5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ddbca5ee-6c30-447d-8667-8c29c151e6d5",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-ddbca5ee-6c30-447d-8667-8c29c151e6d5.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4929",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aa7271323603bc1deb4805eb7f3a39b7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188EA71:1D03DC3:5D968F8B",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "ddbca5ee-6c30-447d-8667-8c29c151e6d5",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9.json
new file mode 100644
index 0000000000..93c71d4854
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/repositories_617210_issues-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "ddbca5ee-6c30-447d-8667-8c29c151e6d5",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-9.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4929",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aa7271323603bc1deb4805eb7f3a39b7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188EA71:1D03DC3:5D968F8B",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "ddbca5ee-6c30-447d-8667-8c29c151e6d5",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1-7741e4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1-7741e4.json
deleted file mode 100644
index 78abb4ba28..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1-7741e4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7741e4f6-c93e-4760-bb92-070e61f5a475",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-7741e4f6-c93e-4760-bb92-070e61f5a475.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:17:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4938",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D5B9:6B2E:188E813:1D03B01:5D968F87"
-    }
-  },
-  "uuid": "7741e4f6-c93e-4760-bb92-070e61f5a475",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1.json
new file mode 100644
index 0000000000..f2e470778b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetIssues/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "7741e4f6-c93e-4760-bb92-070e61f5a475",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:17:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4938",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D5B9:6B2E:188E813:1D03B01:5D968F87"
+    }
+  },
+  "uuid": "7741e4f6-c93e-4760-bb92-070e61f5a475",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user-f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user-f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user_repos-5f89ddd0-72f0-4e2a-9185-0828197b9350.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user_repos-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user_repos-5f89ddd0-72f0-4e2a-9185-0828197b9350.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/user_repos-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/users_bitwiseman-f759e6af-2c5c-46f3-be75-4f3ee733b018.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/users_bitwiseman-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/users_bitwiseman-f759e6af-2c5c-46f3-be75-4f3ee733b018.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/__files/users_bitwiseman-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1-f80e1f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1-f80e1f.json
deleted file mode 100644
index 325506e8d8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1-f80e1f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:26:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4473",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA5F:9901:DFAD6F:107F0A6:5DB3A0DA"
-    }
-  },
-  "uuid": "f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1.json
new file mode 100644
index 0000000000..63f7097cd2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:26:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4473",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA5F:9901:DFAD6F:107F0A6:5DB3A0DA"
+    }
+  },
+  "uuid": "f80e1f71-35ea-4c54-b6e4-529dd1bfb2ef",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3-5f89dd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3-5f89dd.json
deleted file mode 100644
index 0f12a62bae..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3-5f89dd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5f89ddd0-72f0-4e2a-9185-0828197b9350",
-  "name": "user_repos",
-  "request": {
-    "url": "/user/repos?type=all&per_page=30",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_repos-5f89ddd0-72f0-4e2a-9185-0828197b9350.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:26:52 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4470",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"88171b7f02a11516bf8ceb87a7fea40e\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA5F:9901:DFADAF:107F0ED:5DB3A0DB",
-      "Link": "<https://api.github.com/user/repos?type=all&per_page=30&page=2>; rel=\"next\", <https://api.github.com/user/repos?type=all&per_page=30&page=101>; rel=\"last\""
-    }
-  },
-  "uuid": "5f89ddd0-72f0-4e2a-9185-0828197b9350",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3.json
new file mode 100644
index 0000000000..f7066ff7a6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/user_repos-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "5f89ddd0-72f0-4e2a-9185-0828197b9350",
+  "name": "user_repos",
+  "request": {
+    "url": "/user/repos?type=all&per_page=30",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_repos-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:26:52 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4470",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"88171b7f02a11516bf8ceb87a7fea40e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA5F:9901:DFADAF:107F0ED:5DB3A0DB",
+      "Link": "<https://api.github.com/user/repos?type=all&per_page=30&page=2>; rel=\"next\", <https://api.github.com/user/repos?type=all&per_page=30&page=101>; rel=\"last\""
+    }
+  },
+  "uuid": "5f89ddd0-72f0-4e2a-9185-0828197b9350",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2-f759e6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2-f759e6.json
deleted file mode 100644
index e1bf83f3d5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2-f759e6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f759e6af-2c5c-46f3-be75-4f3ee733b018",
-  "name": "users_bitwiseman",
-  "request": {
-    "url": "/users/bitwiseman",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_bitwiseman-f759e6af-2c5c-46f3-be75-4f3ee733b018.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:26:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4471",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA5F:9901:DFAD9C:107F0B2:5DB3A0DB"
-    }
-  },
-  "uuid": "f759e6af-2c5c-46f3-be75-4f3ee733b018",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2.json
new file mode 100644
index 0000000000..d11a3b73db
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetMyself/mappings/users_bitwiseman-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f759e6af-2c5c-46f3-be75-4f3ee733b018",
+  "name": "users_bitwiseman",
+  "request": {
+    "url": "/users/bitwiseman",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_bitwiseman-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:26:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4471",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA5F:9901:DFAD9C:107F0B2:5DB3A0DB"
+    }
+  },
+  "uuid": "f759e6af-2c5c-46f3-be75-4f3ee733b018",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/orgs_github-api-test-org-e1b27b93-da09-4f0e-a103-effeb87370a6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/orgs_github-api-test-org-e1b27b93-da09-4f0e-a103-effeb87370a6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo-cf3c4969-2d22-4218-8665-164a9097d3c6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo-cf3c4969-2d22-4218-8665-164a9097d3c6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo_teams-1dd41f2e-d246-428c-8f65-045e5b885e86.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo_teams-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo_teams-1dd41f2e-d246-428c-8f65-045e5b885e86.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/repos_github-api-test-org_testgetteamsforrepo_teams-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/user-692ed5ba-d82c-446b-9cf6-8820491e366b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/user-692ed5ba-d82c-446b-9cf6-8820491e366b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2-e1b27b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2-e1b27b.json
deleted file mode 100644
index 620f7fdacf..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2-e1b27b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e1b27b93-da09-4f0e-a103-effeb87370a6",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-e1b27b93-da09-4f0e-a103-effeb87370a6.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4313",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE9:833C:55BE01:63F758:5DB3A144"
-    }
-  },
-  "uuid": "e1b27b93-da09-4f0e-a103-effeb87370a6",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..4b029de110
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "e1b27b93-da09-4f0e-a103-effeb87370a6",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4313",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE9:833C:55BE01:63F758:5DB3A144"
+    }
+  },
+  "uuid": "e1b27b93-da09-4f0e-a103-effeb87370a6",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3-cf3c49.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3-cf3c49.json
deleted file mode 100644
index 61e883ccbd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3-cf3c49.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cf3c4969-2d22-4218-8665-164a9097d3c6",
-  "name": "repos_github-api-test-org_testgetteamsforrepo",
-  "request": {
-    "url": "/repos/github-api-test-org/testGetTeamsForRepo",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_testgetteamsforrepo-cf3c4969-2d22-4218-8665-164a9097d3c6.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4312",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"acb34fc073c50a347e3958cb13d21747\"",
-      "Last-Modified": "Sat, 10 May 2014 19:42:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE9:833C:55BE06:63F75D:5DB3A144"
-    }
-  },
-  "uuid": "cf3c4969-2d22-4218-8665-164a9097d3c6",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3.json
new file mode 100644
index 0000000000..933fabada2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "cf3c4969-2d22-4218-8665-164a9097d3c6",
+  "name": "repos_github-api-test-org_testgetteamsforrepo",
+  "request": {
+    "url": "/repos/github-api-test-org/testGetTeamsForRepo",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_testgetteamsforrepo-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4312",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"acb34fc073c50a347e3958cb13d21747\"",
+      "Last-Modified": "Sat, 10 May 2014 19:42:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE9:833C:55BE06:63F75D:5DB3A144"
+    }
+  },
+  "uuid": "cf3c4969-2d22-4218-8665-164a9097d3c6",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4-1dd41f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4-1dd41f.json
deleted file mode 100644
index af5cb7d237..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4-1dd41f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "1dd41f2e-d246-428c-8f65-045e5b885e86",
-  "name": "repos_github-api-test-org_testgetteamsforrepo_teams",
-  "request": {
-    "url": "/repos/github-api-test-org/testGetTeamsForRepo/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_testgetteamsforrepo_teams-1dd41f2e-d246-428c-8f65-045e5b885e86.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4311",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE9:833C:55BE0B:63F763:5DB3A144"
-    }
-  },
-  "uuid": "1dd41f2e-d246-428c-8f65-045e5b885e86",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4.json
new file mode 100644
index 0000000000..d93d9ea633
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/repos_github-api-test-org_testgetteamsforrepo_teams-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "1dd41f2e-d246-428c-8f65-045e5b885e86",
+  "name": "repos_github-api-test-org_testgetteamsforrepo_teams",
+  "request": {
+    "url": "/repos/github-api-test-org/testGetTeamsForRepo/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_testgetteamsforrepo_teams-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4311",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE9:833C:55BE0B:63F763:5DB3A144"
+    }
+  },
+  "uuid": "1dd41f2e-d246-428c-8f65-045e5b885e86",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1-692ed5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1-692ed5.json
deleted file mode 100644
index 35d691ae8a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1-692ed5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "692ed5ba-d82c-446b-9cf6-8820491e366b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-692ed5ba-d82c-446b-9cf6-8820491e366b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4315",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE9:833C:55BDFC:63F753:5DB3A144"
-    }
-  },
-  "uuid": "692ed5ba-d82c-446b-9cf6-8820491e366b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1.json
new file mode 100644
index 0000000000..58fcae53de
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testGetTeamsForRepo/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "692ed5ba-d82c-446b-9cf6-8820491e366b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4315",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE9:833C:55BDFC:63F753:5DB3A144"
+    }
+  },
+  "uuid": "692ed5ba-d82c-446b-9cf6-8820491e366b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_buildhive_buildhive_issues_26_comments-7cd8798a-89d6-4f01-a203-0eb3c111d160.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_buildhive_buildhive_issues_26_comments-54.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_buildhive_buildhive_issues_26_comments-7cd8798a-89d6-4f01-a203-0eb3c111d160.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_buildhive_buildhive_issues_26_comments-54.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_13_comments-5dd3d867-5116-4abc-86ff-038fd86772bb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_13_comments-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_13_comments-5dd3d867-5116-4abc-86ff-038fd86772bb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_13_comments-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_18_comments-ab6d7164-36f9-4042-b3ea-120157a49ce2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_18_comments-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_18_comments-ab6d7164-36f9-4042-b3ea-120157a49ce2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cdfoundation_foundation_issues_18_comments-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_jep-internal-staging_issues_4_comments-70b2060c-1621-4059-92d6-57b43d5cf3d3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_jep-internal-staging_issues_4_comments-32.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_jep-internal-staging_issues_4_comments-70b2060c-1621-4059-92d6-57b43d5cf3d3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_jep-internal-staging_issues_4_comments-32.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_support-analytics_issues_40_comments-392bf11b-01ff-4b4b-be18-d56a295cd56d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_support-analytics_issues_40_comments-25.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_support-analytics_issues_40_comments-392bf11b-01ff-4b4b-be18-d56a295cd56d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_cloudbees_support-analytics_issues_40_comments-25.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_datadog_puppet-datadog-agent_issues_81_comments-2bcf1141-9dc6-4a96-bab5-70bfb95e1c09.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_datadog_puppet-datadog-agent_issues_81_comments-38.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_datadog_puppet-datadog-agent_issues_81_comments-2bcf1141-9dc6-4a96-bab5-70bfb95e1c09.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_datadog_puppet-datadog-agent_issues_81_comments-38.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-279abefb-47c5-47f3-8515-1ee89869be16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-279abefb-47c5-47f3-8515-1ee89869be16.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_178_comments-f84aa364-b44f-4171-8b0b-73202b03f6bd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_178_comments-39.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_178_comments-f84aa364-b44f-4171-8b0b-73202b03f6bd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_178_comments-39.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_416_comments-5957b82d-97dd-4209-b1dc-858199372769.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_416_comments-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_416_comments-5957b82d-97dd-4209-b1dc-858199372769.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_416_comments-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_445_comments-4a0ccab2-b9b2-4d46-9339-004e5a5d7d01.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_445_comments-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_445_comments-4a0ccab2-b9b2-4d46-9339-004e5a5d7d01.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_github-api_github-api_issues_445_comments-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_javaee_jaxb-v2_issues_103_comments-7499861c-3874-4dd8-af28-b86a1a248260.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_javaee_jaxb-v2_issues_103_comments-28.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_javaee_jaxb-v2_issues_103_comments-7499861c-3874-4dd8-af28-b86a1a248260.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_javaee_jaxb-v2_issues_103_comments-28.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-0dd1dc99-189c-456a-9532-e8d8c8beb565.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-0dd1dc99-189c-456a-9532-e8d8c8beb565.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_cobertura-plugin_issues_26_comments-9937db1e-b8e2-459a-99bb-63d076a58576.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_cobertura-plugin_issues_26_comments-9937db1e-b8e2-459a-99bb-63d076a58576.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_junit-plugin_issues_108_comments-8b073dc0-4dd7-4428-b0fd-017e34981000.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_junit-plugin_issues_108_comments-27.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_junit-plugin_issues_108_comments-8b073dc0-4dd7-4428-b0fd-017e34981000.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_junit-plugin_issues_108_comments-27.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_matrix-project-plugin_issues_11_comments-bc1b7539-f071-4d34-8803-ea56ee4ccf52.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_matrix-project-plugin_issues_11_comments-bc1b7539-f071-4d34-8803-ea56ee4ccf52.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_maven-plugin_issues_86_comments-8df64f6b-d2d7-4389-a0c8-166f410896c2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_maven-plugin_issues_86_comments-46.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_maven-plugin_issues_86_comments-8df64f6b-d2d7-4389-a0c8-166f410896c2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_maven-plugin_issues_86_comments-46.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_packaging_issues_57_comments-77b9e551-89d2-48ff-9755-8c476e7e3859.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_packaging_issues_57_comments-41.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_packaging_issues_57_comments-77b9e551-89d2-48ff-9755-8c476e7e3859.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_packaging_issues_57_comments-41.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_port-allocator-plugin_issues_6_comments-d346fa8f-6520-4845-b2dd-a8bacd11df33.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_port-allocator-plugin_issues_6_comments-d346fa8f-6520-4845-b2dd-a8bacd11df33.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-b19ff40f-0a88-4bc0-84ec-19604c3e1d86.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-b19ff40f-0a88-4bc0-84ec-19604c3e1d86.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_subversion-plugin_issues_229_comments-bdd8d87e-acc3-41ff-9fb3-f003176cd32c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_subversion-plugin_issues_229_comments-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_subversion-plugin_issues_229_comments-bdd8d87e-acc3-41ff-9fb3-f003176cd32c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_subversion-plugin_issues_229_comments-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-5d72e1b0-acc2-4cb4-9407-485bf0edbb4a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-5d72e1b0-acc2-4cb4-9407-485bf0edbb4a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-64c20aaf-a552-45f2-b762-13c8332e2e75.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-64c20aaf-a552-45f2-b762-13c8332e2e75.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_access-modifier_issues_18_comments-537dcc25-9bda-405e-8b61-996723dfe239.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_access-modifier_issues_18_comments-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_access-modifier_issues_18_comments-537dcc25-9bda-405e-8b61-996723dfe239.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_access-modifier_issues_18_comments-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_akuma_issues_12_comments-ff723ca0-048e-4130-88c0-b41efb22f9b5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_akuma_issues_12_comments-45.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_akuma_issues_12_comments-ff723ca0-048e-4130-88c0-b41efb22f9b5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_akuma_issues_12_comments-45.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_138_comments-5875b84c-e475-46be-a356-e6a6384d16fc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_138_comments-36.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_138_comments-5875b84c-e475-46be-a356-e6a6384d16fc.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_138_comments-36.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_151_comments-e2c50d75-bd6b-4352-95b7-c6a16edac6cf.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_151_comments-37.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_151_comments-e2c50d75-bd6b-4352-95b7-c6a16edac6cf.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_151_comments-37.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_170_comments-7037b3d3-30bb-473d-a3b7-287381648ac1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_170_comments-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_170_comments-7037b3d3-30bb-473d-a3b7-287381648ac1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_args4j_issues_170_comments-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_com4j_issues_58_comments-a8438cec-832d-4a65-8972-42add8eed66b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_com4j_issues_58_comments-43.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_com4j_issues_58_comments-a8438cec-832d-4a65-8972-42add8eed66b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_com4j_issues_58_comments-43.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-05248ca7-2309-4eb3-934c-74d670a3a6eb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-05248ca7-2309-4eb3-934c-74d670a3a6eb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_file-leak-detector_issues_48_comments-8e7dee31-69ea-4ac3-9894-b2df06f9967f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_file-leak-detector_issues_48_comments-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_file-leak-detector_issues_48_comments-8e7dee31-69ea-4ac3-9894-b2df06f9967f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_file-leak-detector_issues_48_comments-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_j-interop_issues_3_comments-6785e2b0-ef61-4233-9fac-998b581bf5a4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_j-interop_issues_3_comments-48.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_j-interop_issues_3_comments-6785e2b0-ef61-4233-9fac-998b581bf5a4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_j-interop_issues_3_comments-48.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_libpam4j_issues_12_comments-902180ec-5fe6-44fc-95e6-bc1c994a895c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_libpam4j_issues_12_comments-30.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_libpam4j_issues_12_comments-902180ec-5fe6-44fc-95e6-bc1c994a895c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_libpam4j_issues_12_comments-30.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_localizer_issues_7_comments-4d459f11-3522-44d2-b3df-68833ac7d17f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_localizer_issues_7_comments-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_localizer_issues_7_comments-4d459f11-3522-44d2-b3df-68833ac7d17f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_localizer_issues_7_comments-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_mimepull_issues_2_comments-a09ab691-cab7-4a08-9d01-9e83aaa1e8d7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_mimepull_issues_2_comments-40.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_mimepull_issues_2_comments-a09ab691-cab7-4a08-9d01-9e83aaa1e8d7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_mimepull_issues_2_comments-40.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winp_issues_64_comments-ce501b97-f7fc-48e2-92f2-39d37ad03b0c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winp_issues_64_comments-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winp_issues_64_comments-ce501b97-f7fc-48e2-92f2-39d37ad03b0c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winp_issues_64_comments-23.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_199_comments-e75ddcfb-3e74-4d2a-9372-3bf43f0acea0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_199_comments-35.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_199_comments-e75ddcfb-3e74-4d2a-9372-3bf43f0acea0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_199_comments-35.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_288_comments-6372463b-b035-44ab-aa19-f95c2dda08e9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_288_comments-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_288_comments-6372463b-b035-44ab-aa19-f95c2dda08e9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_288_comments-22.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_348_comments-92f2c6c5-159c-4d8d-8c1b-a685e1a346a3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_348_comments-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_348_comments-92f2c6c5-159c-4d8d-8c1b-a685e1a346a3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_348_comments-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_401_comments-592b0cc1-594f-4d29-9f48-154c9dbbccea.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_401_comments-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_401_comments-592b0cc1-594f-4d29-9f48-154c9dbbccea.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_kohsuke_winsw_issues_401_comments-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_mojohaus_animal-sniffer_issues_9_comments-f2e8ce53-9c07-4118-be54-55ea43212f64.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_mojohaus_animal-sniffer_issues_9_comments-50.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_mojohaus_animal-sniffer_issues_9_comments-f2e8ce53-9c07-4118-be54-55ea43212f64.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_mojohaus_animal-sniffer_issues_9_comments-50.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_oracle_opengrok_issues_966_comments-5980616e-a5c0-4060-9d8c-7272da82fb74.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_oracle_opengrok_issues_966_comments-44.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_oracle_opengrok_issues_966_comments-5980616e-a5c0-4060-9d8c-7272da82fb74.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_oracle_opengrok_issues_966_comments-44.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_salesforcelabs_forcepad_issues_25_comments-aa901e2c-ed25-4848-b60a-d8b6be3ed996.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_salesforcelabs_forcepad_issues_25_comments-53.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_salesforcelabs_forcepad_issues_25_comments-aa901e2c-ed25-4848-b60a-d8b6be3ed996.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_salesforcelabs_forcepad_issues_25_comments-53.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_voxpupuli_puppet-jenkins_issues_110_comments-d9b77135-2860-4595-ac00-01203f426501.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_voxpupuli_puppet-jenkins_issues_110_comments-d9b77135-2860-4595-ac00-01203f426501.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-a3ad6065-e8f9-4470-91cc-ee3982bfb8df.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-a3ad6065-e8f9-4470-91cc-ee3982bfb8df.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-e1b5c11f-4469-4044-9cfc-0529b04bb1c3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-e1b5c11f-4469-4044-9cfc-0529b04bb1c3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-7e3768e1-e5c1-457a-9354-f5d9ef504fc2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-34.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-7e3768e1-e5c1-457a-9354-f5d9ef504fc2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/search_issues-34.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/user-b01b8228-347d-439f-a3f7-db38f3d15881.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/user-b01b8228-347d-439f-a3f7-db38f3d15881.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54-7cd879.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54-7cd879.json
deleted file mode 100644
index db7f6a6147..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54-7cd879.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "7cd8798a-89d6-4f01-a203-0eb3c111d160",
-  "name": "repos_buildhive_buildhive_issues_26_comments",
-  "request": {
-    "url": "/repos/buildhive/buildhive/issues/26/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_buildhive_buildhive_issues_26_comments-7cd8798a-89d6-4f01-a203-0eb3c111d160.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4822",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"0dcc30956758042c3866d8bab826c669\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF630:726ADA:5E5090EC"
-    }
-  },
-  "uuid": "7cd8798a-89d6-4f01-a203-0eb3c111d160",
-  "persistent": true,
-  "insertionIndex": 54
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54.json
new file mode 100644
index 0000000000..db120aaf23
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_buildhive_buildhive_issues_26_comments-54.json
@@ -0,0 +1,47 @@
+{
+  "id": "7cd8798a-89d6-4f01-a203-0eb3c111d160",
+  "name": "repos_buildhive_buildhive_issues_26_comments",
+  "request": {
+    "url": "/repos/buildhive/buildhive/issues/26/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_buildhive_buildhive_issues_26_comments-54.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4822",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"0dcc30956758042c3866d8bab826c669\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF630:726ADA:5E5090EC"
+    }
+  },
+  "uuid": "7cd8798a-89d6-4f01-a203-0eb3c111d160",
+  "persistent": true,
+  "insertionIndex": 54
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16-5dd3d8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16-5dd3d8.json
deleted file mode 100644
index da12b7d273..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16-5dd3d8.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "5dd3d867-5116-4abc-86ff-038fd86772bb",
-  "name": "repos_cdfoundation_foundation_issues_13_comments",
-  "request": {
-    "url": "/repos/cdfoundation/foundation/issues/13/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_cdfoundation_foundation_issues_13_comments-5dd3d867-5116-4abc-86ff-038fd86772bb.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4859",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"1014504c4b4fbefc122941979a5616c1\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4FA:72696B:5E5090E3"
-    }
-  },
-  "uuid": "5dd3d867-5116-4abc-86ff-038fd86772bb",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16.json
new file mode 100644
index 0000000000..a928c674fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_13_comments-16.json
@@ -0,0 +1,47 @@
+{
+  "id": "5dd3d867-5116-4abc-86ff-038fd86772bb",
+  "name": "repos_cdfoundation_foundation_issues_13_comments",
+  "request": {
+    "url": "/repos/cdfoundation/foundation/issues/13/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_cdfoundation_foundation_issues_13_comments-16.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4859",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"1014504c4b4fbefc122941979a5616c1\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4FA:72696B:5E5090E3"
+    }
+  },
+  "uuid": "5dd3d867-5116-4abc-86ff-038fd86772bb",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17-ab6d71.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17-ab6d71.json
deleted file mode 100644
index e636695582..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17-ab6d71.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ab6d7164-36f9-4042-b3ea-120157a49ce2",
-  "name": "repos_cdfoundation_foundation_issues_18_comments",
-  "request": {
-    "url": "/repos/cdfoundation/foundation/issues/18/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_cdfoundation_foundation_issues_18_comments-ab6d7164-36f9-4042-b3ea-120157a49ce2.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4858",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"2ce67f261ccfdb14dc4d07b5871ba40c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4FF:726971:5E5090E3"
-    }
-  },
-  "uuid": "ab6d7164-36f9-4042-b3ea-120157a49ce2",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17.json
new file mode 100644
index 0000000000..7de59e7b9f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cdfoundation_foundation_issues_18_comments-17.json
@@ -0,0 +1,47 @@
+{
+  "id": "ab6d7164-36f9-4042-b3ea-120157a49ce2",
+  "name": "repos_cdfoundation_foundation_issues_18_comments",
+  "request": {
+    "url": "/repos/cdfoundation/foundation/issues/18/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_cdfoundation_foundation_issues_18_comments-17.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4858",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"2ce67f261ccfdb14dc4d07b5871ba40c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4FF:726971:5E5090E3"
+    }
+  },
+  "uuid": "ab6d7164-36f9-4042-b3ea-120157a49ce2",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32-70b206.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32-70b206.json
deleted file mode 100644
index 2b98ee66d9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32-70b206.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "70b2060c-1621-4059-92d6-57b43d5cf3d3",
-  "name": "repos_cloudbees_jep-internal-staging_issues_4_comments",
-  "request": {
-    "url": "/repos/cloudbees/jep-internal-staging/issues/4/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_cloudbees_jep-internal-staging_issues_4_comments-70b2060c-1621-4059-92d6-57b43d5cf3d3.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4843",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"35dabd2f06caa81f9fbe194c83e09b34\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF57B:726A02:5E5090E7"
-    }
-  },
-  "uuid": "70b2060c-1621-4059-92d6-57b43d5cf3d3",
-  "persistent": true,
-  "insertionIndex": 32
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32.json
new file mode 100644
index 0000000000..45b1f818de
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_jep-internal-staging_issues_4_comments-32.json
@@ -0,0 +1,47 @@
+{
+  "id": "70b2060c-1621-4059-92d6-57b43d5cf3d3",
+  "name": "repos_cloudbees_jep-internal-staging_issues_4_comments",
+  "request": {
+    "url": "/repos/cloudbees/jep-internal-staging/issues/4/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_cloudbees_jep-internal-staging_issues_4_comments-32.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4843",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"35dabd2f06caa81f9fbe194c83e09b34\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF57B:726A02:5E5090E7"
+    }
+  },
+  "uuid": "70b2060c-1621-4059-92d6-57b43d5cf3d3",
+  "persistent": true,
+  "insertionIndex": 32
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25-392bf1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25-392bf1.json
deleted file mode 100644
index d11945ce85..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25-392bf1.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "392bf11b-01ff-4b4b-be18-d56a295cd56d",
-  "name": "repos_cloudbees_support-analytics_issues_40_comments",
-  "request": {
-    "url": "/repos/cloudbees/support-analytics/issues/40/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_cloudbees_support-analytics_issues_40_comments-392bf11b-01ff-4b4b-be18-d56a295cd56d.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4850",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"74e3cee720635fa8af9cb29500dad7f4\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF52F:7269AB:5E5090E5"
-    }
-  },
-  "uuid": "392bf11b-01ff-4b4b-be18-d56a295cd56d",
-  "persistent": true,
-  "insertionIndex": 25
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25.json
new file mode 100644
index 0000000000..c8a273e1da
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_cloudbees_support-analytics_issues_40_comments-25.json
@@ -0,0 +1,47 @@
+{
+  "id": "392bf11b-01ff-4b4b-be18-d56a295cd56d",
+  "name": "repos_cloudbees_support-analytics_issues_40_comments",
+  "request": {
+    "url": "/repos/cloudbees/support-analytics/issues/40/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_cloudbees_support-analytics_issues_40_comments-25.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4850",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"74e3cee720635fa8af9cb29500dad7f4\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF52F:7269AB:5E5090E5"
+    }
+  },
+  "uuid": "392bf11b-01ff-4b4b-be18-d56a295cd56d",
+  "persistent": true,
+  "insertionIndex": 25
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38-2bcf11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38-2bcf11.json
deleted file mode 100644
index 57002c0c1f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38-2bcf11.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "2bcf1141-9dc6-4a96-bab5-70bfb95e1c09",
-  "name": "repos_datadog_puppet-datadog-agent_issues_81_comments",
-  "request": {
-    "url": "/repos/DataDog/puppet-datadog-agent/issues/81/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_datadog_puppet-datadog-agent_issues_81_comments-2bcf1141-9dc6-4a96-bab5-70bfb95e1c09.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4838",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"6e13a3799044799a9add3b8a88446ee8\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5C5:726A60:5E5090E9"
-    }
-  },
-  "uuid": "2bcf1141-9dc6-4a96-bab5-70bfb95e1c09",
-  "persistent": true,
-  "insertionIndex": 38
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38.json
new file mode 100644
index 0000000000..41488dea80
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_datadog_puppet-datadog-agent_issues_81_comments-38.json
@@ -0,0 +1,47 @@
+{
+  "id": "2bcf1141-9dc6-4a96-bab5-70bfb95e1c09",
+  "name": "repos_datadog_puppet-datadog-agent_issues_81_comments",
+  "request": {
+    "url": "/repos/DataDog/puppet-datadog-agent/issues/81/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_datadog_puppet-datadog-agent_issues_81_comments-38.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4838",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"6e13a3799044799a9add3b8a88446ee8\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5C5:726A60:5E5090E9"
+    }
+  },
+  "uuid": "2bcf1141-9dc6-4a96-bab5-70bfb95e1c09",
+  "persistent": true,
+  "insertionIndex": 38
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12-279abe.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12-279abe.json
deleted file mode 100644
index 275895bede..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12-279abe.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "279abefb-47c5-47f3-8515-1ee89869be16",
-  "name": "repos_eclipse-ee4j_jaxb-ri_issues_103_comments",
-  "request": {
-    "url": "/repos/eclipse-ee4j/jaxb-ri/issues/103/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_eclipse-ee4j_jaxb-ri_issues_103_comments-279abefb-47c5-47f3-8515-1ee89869be16.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4863",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"ba2849d848c5efd3f859d0881d1d4b6c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4D9:726942:5E5090E2"
-    }
-  },
-  "uuid": "279abefb-47c5-47f3-8515-1ee89869be16",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json
new file mode 100644
index 0000000000..f9e38842fa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json
@@ -0,0 +1,47 @@
+{
+  "id": "279abefb-47c5-47f3-8515-1ee89869be16",
+  "name": "repos_eclipse-ee4j_jaxb-ri_issues_103_comments",
+  "request": {
+    "url": "/repos/eclipse-ee4j/jaxb-ri/issues/103/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_eclipse-ee4j_jaxb-ri_issues_103_comments-12.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4863",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"ba2849d848c5efd3f859d0881d1d4b6c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4D9:726942:5E5090E2"
+    }
+  },
+  "uuid": "279abefb-47c5-47f3-8515-1ee89869be16",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39-f84aa3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39-f84aa3.json
deleted file mode 100644
index 3adb6f5423..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39-f84aa3.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "f84aa364-b44f-4171-8b0b-73202b03f6bd",
-  "name": "repos_github-api_github-api_issues_178_comments",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/178/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_178_comments-f84aa364-b44f-4171-8b0b-73202b03f6bd.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4837",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a2b346db8791e6eadf1b517be5d8ce20\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5C8:726A63:5E5090E9"
-    }
-  },
-  "uuid": "f84aa364-b44f-4171-8b0b-73202b03f6bd",
-  "persistent": true,
-  "insertionIndex": 39
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39.json
new file mode 100644
index 0000000000..5af1483d64
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_178_comments-39.json
@@ -0,0 +1,47 @@
+{
+  "id": "f84aa364-b44f-4171-8b0b-73202b03f6bd",
+  "name": "repos_github-api_github-api_issues_178_comments",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/178/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_178_comments-39.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4837",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a2b346db8791e6eadf1b517be5d8ce20\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5C8:726A63:5E5090E9"
+    }
+  },
+  "uuid": "f84aa364-b44f-4171-8b0b-73202b03f6bd",
+  "persistent": true,
+  "insertionIndex": 39
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11-5957b8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11-5957b8.json
deleted file mode 100644
index 5f367a5c3b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11-5957b8.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "5957b82d-97dd-4209-b1dc-858199372769",
-  "name": "repos_github-api_github-api_issues_416_comments",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/416/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_416_comments-5957b82d-97dd-4209-b1dc-858199372769.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4864",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9176108a9fe63fb06cd05fee3e7abb86\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4D4:72693D:5E5090E2"
-    }
-  },
-  "uuid": "5957b82d-97dd-4209-b1dc-858199372769",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11.json
new file mode 100644
index 0000000000..96cb1e5a2d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_416_comments-11.json
@@ -0,0 +1,47 @@
+{
+  "id": "5957b82d-97dd-4209-b1dc-858199372769",
+  "name": "repos_github-api_github-api_issues_416_comments",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/416/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_416_comments-11.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4864",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9176108a9fe63fb06cd05fee3e7abb86\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4D4:72693D:5E5090E2"
+    }
+  },
+  "uuid": "5957b82d-97dd-4209-b1dc-858199372769",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9-4a0cca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9-4a0cca.json
deleted file mode 100644
index 22a97b4ef8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9-4a0cca.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "4a0ccab2-b9b2-4d46-9339-004e5a5d7d01",
-  "name": "repos_github-api_github-api_issues_445_comments",
-  "request": {
-    "url": "/repos/github-api/github-api/issues/445/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues_445_comments-4a0ccab2-b9b2-4d46-9339-004e5a5d7d01.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4866",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"96c322d4e24c55891acf51e82cf94742\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4CD:726935:5E5090E1"
-    }
-  },
-  "uuid": "4a0ccab2-b9b2-4d46-9339-004e5a5d7d01",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9.json
new file mode 100644
index 0000000000..caf7e9e24b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_github-api_github-api_issues_445_comments-9.json
@@ -0,0 +1,47 @@
+{
+  "id": "4a0ccab2-b9b2-4d46-9339-004e5a5d7d01",
+  "name": "repos_github-api_github-api_issues_445_comments",
+  "request": {
+    "url": "/repos/github-api/github-api/issues/445/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues_445_comments-9.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4866",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"96c322d4e24c55891acf51e82cf94742\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4CD:726935:5E5090E1"
+    }
+  },
+  "uuid": "4a0ccab2-b9b2-4d46-9339-004e5a5d7d01",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28-749986.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28-749986.json
deleted file mode 100644
index 137f5c748c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28-749986.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "7499861c-3874-4dd8-af28-b86a1a248260",
-  "name": "repos_javaee_jaxb-v2_issues_103_comments",
-  "request": {
-    "url": "/repos/javaee/jaxb-v2/issues/103/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_javaee_jaxb-v2_issues_103_comments-7499861c-3874-4dd8-af28-b86a1a248260.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4847",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"4994659b870b6abfcad7a19792ed6523\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF544:7269C3:5E5090E5"
-    }
-  },
-  "uuid": "7499861c-3874-4dd8-af28-b86a1a248260",
-  "persistent": true,
-  "insertionIndex": 28
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28.json
new file mode 100644
index 0000000000..b4d80e80dd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_javaee_jaxb-v2_issues_103_comments-28.json
@@ -0,0 +1,47 @@
+{
+  "id": "7499861c-3874-4dd8-af28-b86a1a248260",
+  "name": "repos_javaee_jaxb-v2_issues_103_comments",
+  "request": {
+    "url": "/repos/javaee/jaxb-v2/issues/103/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_javaee_jaxb-v2_issues_103_comments-28.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4847",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"4994659b870b6abfcad7a19792ed6523\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF544:7269C3:5E5090E5"
+    }
+  },
+  "uuid": "7499861c-3874-4dd8-af28-b86a1a248260",
+  "persistent": true,
+  "insertionIndex": 28
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29-0dd1dc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29-0dd1dc.json
deleted file mode 100644
index 884e4c5ea7..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29-0dd1dc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "0dd1dc99-189c-456a-9532-e8d8c8beb565",
-  "name": "repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments",
-  "request": {
-    "url": "/repos/jenkins-infra/java.net-scm-issue-link/issues/1/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-0dd1dc99-189c-456a-9532-e8d8c8beb565.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4846",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"82b6e91655efab50113f701b9a81c277\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF55A:7269D7:5E5090E6"
-    }
-  },
-  "uuid": "0dd1dc99-189c-456a-9532-e8d8c8beb565",
-  "persistent": true,
-  "insertionIndex": 29
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json
new file mode 100644
index 0000000000..4e64bad8cf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json
@@ -0,0 +1,47 @@
+{
+  "id": "0dd1dc99-189c-456a-9532-e8d8c8beb565",
+  "name": "repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments",
+  "request": {
+    "url": "/repos/jenkins-infra/java.net-scm-issue-link/issues/1/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkins-infra_javanet-scm-issue-link_issues_1_comments-29.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4846",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"82b6e91655efab50113f701b9a81c277\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF55A:7269D7:5E5090E6"
+    }
+  },
+  "uuid": "0dd1dc99-189c-456a-9532-e8d8c8beb565",
+  "persistent": true,
+  "insertionIndex": 29
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_aws-credentials-plugin_issues_38_comments-33-cb19fd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_aws-credentials-plugin_issues_38_comments-33.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_aws-credentials-plugin_issues_38_comments-33-cb19fd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_aws-credentials-plugin_issues_38_comments-33.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21-9937db.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21-9937db.json
deleted file mode 100644
index aaa29b1b26..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21-9937db.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "9937db1e-b8e2-459a-99bb-63d076a58576",
-  "name": "repos_jenkinsci_cobertura-plugin_issues_26_comments",
-  "request": {
-    "url": "/repos/jenkinsci/cobertura-plugin/issues/26/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_cobertura-plugin_issues_26_comments-9937db1e-b8e2-459a-99bb-63d076a58576.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4854",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"ed1ee4f4a4e80e9b52f88d587478c77b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF512:726986:5E5090E4"
-    }
-  },
-  "uuid": "9937db1e-b8e2-459a-99bb-63d076a58576",
-  "persistent": true,
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json
new file mode 100644
index 0000000000..a8c4bc93a2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json
@@ -0,0 +1,47 @@
+{
+  "id": "9937db1e-b8e2-459a-99bb-63d076a58576",
+  "name": "repos_jenkinsci_cobertura-plugin_issues_26_comments",
+  "request": {
+    "url": "/repos/jenkinsci/cobertura-plugin/issues/26/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_cobertura-plugin_issues_26_comments-21.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4854",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"ed1ee4f4a4e80e9b52f88d587478c77b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF512:726986:5E5090E4"
+    }
+  },
+  "uuid": "9937db1e-b8e2-459a-99bb-63d076a58576",
+  "persistent": true,
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27-8b073d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27-8b073d.json
deleted file mode 100644
index f619325fd4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27-8b073d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "8b073dc0-4dd7-4428-b0fd-017e34981000",
-  "name": "repos_jenkinsci_junit-plugin_issues_108_comments",
-  "request": {
-    "url": "/repos/jenkinsci/junit-plugin/issues/108/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_junit-plugin_issues_108_comments-8b073dc0-4dd7-4428-b0fd-017e34981000.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4848",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"37a387a0759570ca2faaa5f557951787\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF540:7269BE:5E5090E5"
-    }
-  },
-  "uuid": "8b073dc0-4dd7-4428-b0fd-017e34981000",
-  "persistent": true,
-  "insertionIndex": 27
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27.json
new file mode 100644
index 0000000000..c05a5854fd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_junit-plugin_issues_108_comments-27.json
@@ -0,0 +1,47 @@
+{
+  "id": "8b073dc0-4dd7-4428-b0fd-017e34981000",
+  "name": "repos_jenkinsci_junit-plugin_issues_108_comments",
+  "request": {
+    "url": "/repos/jenkinsci/junit-plugin/issues/108/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_junit-plugin_issues_108_comments-27.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4848",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"37a387a0759570ca2faaa5f557951787\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF540:7269BE:5E5090E5"
+    }
+  },
+  "uuid": "8b073dc0-4dd7-4428-b0fd-017e34981000",
+  "persistent": true,
+  "insertionIndex": 27
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51-bc1b75.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51-bc1b75.json
deleted file mode 100644
index d95770e657..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51-bc1b75.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "bc1b7539-f071-4d34-8803-ea56ee4ccf52",
-  "name": "repos_jenkinsci_matrix-project-plugin_issues_11_comments",
-  "request": {
-    "url": "/repos/jenkinsci/matrix-project-plugin/issues/11/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_matrix-project-plugin_issues_11_comments-bc1b7539-f071-4d34-8803-ea56ee4ccf52.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4825",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"8c13aaab66c960a77aa58bf86ae0020d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF619:726AC2:5E5090EB"
-    }
-  },
-  "uuid": "bc1b7539-f071-4d34-8803-ea56ee4ccf52",
-  "persistent": true,
-  "insertionIndex": 51
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json
new file mode 100644
index 0000000000..d114d97bcb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json
@@ -0,0 +1,47 @@
+{
+  "id": "bc1b7539-f071-4d34-8803-ea56ee4ccf52",
+  "name": "repos_jenkinsci_matrix-project-plugin_issues_11_comments",
+  "request": {
+    "url": "/repos/jenkinsci/matrix-project-plugin/issues/11/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_matrix-project-plugin_issues_11_comments-51.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4825",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"8c13aaab66c960a77aa58bf86ae0020d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF619:726AC2:5E5090EB"
+    }
+  },
+  "uuid": "bc1b7539-f071-4d34-8803-ea56ee4ccf52",
+  "persistent": true,
+  "insertionIndex": 51
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46-8df64f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46-8df64f.json
deleted file mode 100644
index cb0e501fbc..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46-8df64f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "8df64f6b-d2d7-4389-a0c8-166f410896c2",
-  "name": "repos_jenkinsci_maven-plugin_issues_86_comments",
-  "request": {
-    "url": "/repos/jenkinsci/maven-plugin/issues/86/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_maven-plugin_issues_86_comments-8df64f6b-d2d7-4389-a0c8-166f410896c2.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4830",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"b451c4d2c52cc4ce966ddaabdd9dc289\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5F9:726A9C:5E5090EA"
-    }
-  },
-  "uuid": "8df64f6b-d2d7-4389-a0c8-166f410896c2",
-  "persistent": true,
-  "insertionIndex": 46
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46.json
new file mode 100644
index 0000000000..97de6f340a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_maven-plugin_issues_86_comments-46.json
@@ -0,0 +1,47 @@
+{
+  "id": "8df64f6b-d2d7-4389-a0c8-166f410896c2",
+  "name": "repos_jenkinsci_maven-plugin_issues_86_comments",
+  "request": {
+    "url": "/repos/jenkinsci/maven-plugin/issues/86/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_maven-plugin_issues_86_comments-46.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4830",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"b451c4d2c52cc4ce966ddaabdd9dc289\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5F9:726A9C:5E5090EA"
+    }
+  },
+  "uuid": "8df64f6b-d2d7-4389-a0c8-166f410896c2",
+  "persistent": true,
+  "insertionIndex": 46
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41-77b9e5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41-77b9e5.json
deleted file mode 100644
index 5b37d37759..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41-77b9e5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "77b9e551-89d2-48ff-9755-8c476e7e3859",
-  "name": "repos_jenkinsci_packaging_issues_57_comments",
-  "request": {
-    "url": "/repos/jenkinsci/packaging/issues/57/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_packaging_issues_57_comments-77b9e551-89d2-48ff-9755-8c476e7e3859.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4835",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"4549842611b52bf838c7e0da61b8f931\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5D4:726A74:5E5090E9"
-    }
-  },
-  "uuid": "77b9e551-89d2-48ff-9755-8c476e7e3859",
-  "persistent": true,
-  "insertionIndex": 41
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41.json
new file mode 100644
index 0000000000..6e357878f4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_packaging_issues_57_comments-41.json
@@ -0,0 +1,47 @@
+{
+  "id": "77b9e551-89d2-48ff-9755-8c476e7e3859",
+  "name": "repos_jenkinsci_packaging_issues_57_comments",
+  "request": {
+    "url": "/repos/jenkinsci/packaging/issues/57/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_packaging_issues_57_comments-41.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4835",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"4549842611b52bf838c7e0da61b8f931\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5D4:726A74:5E5090E9"
+    }
+  },
+  "uuid": "77b9e551-89d2-48ff-9755-8c476e7e3859",
+  "persistent": true,
+  "insertionIndex": 41
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49-d346fa.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49-d346fa.json
deleted file mode 100644
index ee73722f7f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49-d346fa.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "d346fa8f-6520-4845-b2dd-a8bacd11df33",
-  "name": "repos_jenkinsci_port-allocator-plugin_issues_6_comments",
-  "request": {
-    "url": "/repos/jenkinsci/port-allocator-plugin/issues/6/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_port-allocator-plugin_issues_6_comments-d346fa8f-6520-4845-b2dd-a8bacd11df33.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4827",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"bbdba68bed4361bd0140bd22cb9cc25c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF60C:726AB1:5E5090EB"
-    }
-  },
-  "uuid": "d346fa8f-6520-4845-b2dd-a8bacd11df33",
-  "persistent": true,
-  "insertionIndex": 49
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json
new file mode 100644
index 0000000000..b9c81b9661
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json
@@ -0,0 +1,47 @@
+{
+  "id": "d346fa8f-6520-4845-b2dd-a8bacd11df33",
+  "name": "repos_jenkinsci_port-allocator-plugin_issues_6_comments",
+  "request": {
+    "url": "/repos/jenkinsci/port-allocator-plugin/issues/6/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_port-allocator-plugin_issues_6_comments-49.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4827",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"bbdba68bed4361bd0140bd22cb9cc25c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF60C:726AB1:5E5090EB"
+    }
+  },
+  "uuid": "d346fa8f-6520-4845-b2dd-a8bacd11df33",
+  "persistent": true,
+  "insertionIndex": 49
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31-b19ff4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31-b19ff4.json
deleted file mode 100644
index 0b5f06bbe9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31-b19ff4.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "b19ff40f-0a88-4bc0-84ec-19604c3e1d86",
-  "name": "repos_jenkinsci_ruby-runtime-plugin_issues_6_comments",
-  "request": {
-    "url": "/repos/jenkinsci/ruby-runtime-plugin/issues/6/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-b19ff40f-0a88-4bc0-84ec-19604c3e1d86.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4844",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"f204e9b4cbe80aecb46efb882a3af882\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF56C:7269F4:5E5090E6"
-    }
-  },
-  "uuid": "b19ff40f-0a88-4bc0-84ec-19604c3e1d86",
-  "persistent": true,
-  "insertionIndex": 31
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json
new file mode 100644
index 0000000000..3ad687e8b2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json
@@ -0,0 +1,47 @@
+{
+  "id": "b19ff40f-0a88-4bc0-84ec-19604c3e1d86",
+  "name": "repos_jenkinsci_ruby-runtime-plugin_issues_6_comments",
+  "request": {
+    "url": "/repos/jenkinsci/ruby-runtime-plugin/issues/6/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_ruby-runtime-plugin_issues_6_comments-31.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4844",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"f204e9b4cbe80aecb46efb882a3af882\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF56C:7269F4:5E5090E6"
+    }
+  },
+  "uuid": "b19ff40f-0a88-4bc0-84ec-19604c3e1d86",
+  "persistent": true,
+  "insertionIndex": 31
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10-bdd8d8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10-bdd8d8.json
deleted file mode 100644
index 4823a5a426..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10-bdd8d8.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "bdd8d87e-acc3-41ff-9fb3-f003176cd32c",
-  "name": "repos_jenkinsci_subversion-plugin_issues_229_comments",
-  "request": {
-    "url": "/repos/jenkinsci/subversion-plugin/issues/229/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_subversion-plugin_issues_229_comments-bdd8d87e-acc3-41ff-9fb3-f003176cd32c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4865",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"e331e33659c290e561cdfbd10d641570\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4D1:72693A:5E5090E2"
-    }
-  },
-  "uuid": "bdd8d87e-acc3-41ff-9fb3-f003176cd32c",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10.json
new file mode 100644
index 0000000000..7fd283d16f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_subversion-plugin_issues_229_comments-10.json
@@ -0,0 +1,47 @@
+{
+  "id": "bdd8d87e-acc3-41ff-9fb3-f003176cd32c",
+  "name": "repos_jenkinsci_subversion-plugin_issues_229_comments",
+  "request": {
+    "url": "/repos/jenkinsci/subversion-plugin/issues/229/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_subversion-plugin_issues_229_comments-10.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4865",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"e331e33659c290e561cdfbd10d641570\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4D1:72693A:5E5090E2"
+    }
+  },
+  "uuid": "bdd8d87e-acc3-41ff-9fb3-f003176cd32c",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24-5d72e1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24-5d72e1.json
deleted file mode 100644
index 9f0ce5f29e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24-5d72e1.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "5d72e1b0-acc2-4cb4-9407-485bf0edbb4a",
-  "name": "repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments",
-  "request": {
-    "url": "/repos/jenkinsci/workflow-basic-steps-plugin/issues/80/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-5d72e1b0-acc2-4cb4-9407-485bf0edbb4a.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4851",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"0706062c1ad061d62398624e2fe7a448\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF528:7269A2:5E5090E5"
-    }
-  },
-  "uuid": "5d72e1b0-acc2-4cb4-9407-485bf0edbb4a",
-  "persistent": true,
-  "insertionIndex": 24
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json
new file mode 100644
index 0000000000..d03ac0ba89
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json
@@ -0,0 +1,47 @@
+{
+  "id": "5d72e1b0-acc2-4cb4-9407-485bf0edbb4a",
+  "name": "repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments",
+  "request": {
+    "url": "/repos/jenkinsci/workflow-basic-steps-plugin/issues/80/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_workflow-basic-steps-plugin_issues_80_comments-24.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4851",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"0706062c1ad061d62398624e2fe7a448\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF528:7269A2:5E5090E5"
+    }
+  },
+  "uuid": "5d72e1b0-acc2-4cb4-9407-485bf0edbb4a",
+  "persistent": true,
+  "insertionIndex": 24
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7-64c20a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7-64c20a.json
deleted file mode 100644
index a0039883d1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7-64c20a.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "64c20aaf-a552-45f2-b762-13c8332e2e75",
-  "name": "repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments",
-  "request": {
-    "url": "/repos/jenkinsci/workflow-basic-steps-plugin/issues/97/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-64c20aaf-a552-45f2-b762-13c8332e2e75.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4868",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"414e73e82dcdc5e321122bcdd1333d30\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4C0:72692A:5E5090E1"
-    }
-  },
-  "uuid": "64c20aaf-a552-45f2-b762-13c8332e2e75",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json
new file mode 100644
index 0000000000..006b487c23
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "64c20aaf-a552-45f2-b762-13c8332e2e75",
+  "name": "repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments",
+  "request": {
+    "url": "/repos/jenkinsci/workflow-basic-steps-plugin/issues/97/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_workflow-basic-steps-plugin_issues_97_comments-7.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4868",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"414e73e82dcdc5e321122bcdd1333d30\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4C0:72692A:5E5090E1"
+    }
+  },
+  "uuid": "64c20aaf-a552-45f2-b762-13c8332e2e75",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-cps-global-lib-plugin_issues_76_comments-19-d17aa2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-cps-global-lib-plugin_issues_76_comments-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-cps-global-lib-plugin_issues_76_comments-19-d17aa2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_jenkinsci_workflow-cps-global-lib-plugin_issues_76_comments-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4-537dcc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4-537dcc.json
deleted file mode 100644
index e5417b9cef..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4-537dcc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "537dcc25-9bda-405e-8b61-996723dfe239",
-  "name": "repos_kohsuke_access-modifier_issues_18_comments",
-  "request": {
-    "url": "/repos/kohsuke/access-modifier/issues/18/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_access-modifier_issues_18_comments-537dcc25-9bda-405e-8b61-996723dfe239.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4871",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"650034350572d280860e6a0343578b86\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4AE:72690E:5E5090E0"
-    }
-  },
-  "uuid": "537dcc25-9bda-405e-8b61-996723dfe239",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4.json
new file mode 100644
index 0000000000..61b88a3184
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_access-modifier_issues_18_comments-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "537dcc25-9bda-405e-8b61-996723dfe239",
+  "name": "repos_kohsuke_access-modifier_issues_18_comments",
+  "request": {
+    "url": "/repos/kohsuke/access-modifier/issues/18/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_access-modifier_issues_18_comments-4.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4871",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"650034350572d280860e6a0343578b86\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4AE:72690E:5E5090E0"
+    }
+  },
+  "uuid": "537dcc25-9bda-405e-8b61-996723dfe239",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45-ff723c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45-ff723c.json
deleted file mode 100644
index f71390132f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45-ff723c.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ff723ca0-048e-4130-88c0-b41efb22f9b5",
-  "name": "repos_kohsuke_akuma_issues_12_comments",
-  "request": {
-    "url": "/repos/kohsuke/akuma/issues/12/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_akuma_issues_12_comments-ff723ca0-048e-4130-88c0-b41efb22f9b5.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4831",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"736c00f3d218b488033ab06ef3201370\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5F2:726A97:5E5090EA"
-    }
-  },
-  "uuid": "ff723ca0-048e-4130-88c0-b41efb22f9b5",
-  "persistent": true,
-  "insertionIndex": 45
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45.json
new file mode 100644
index 0000000000..40adcefc0b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_akuma_issues_12_comments-45.json
@@ -0,0 +1,47 @@
+{
+  "id": "ff723ca0-048e-4130-88c0-b41efb22f9b5",
+  "name": "repos_kohsuke_akuma_issues_12_comments",
+  "request": {
+    "url": "/repos/kohsuke/akuma/issues/12/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_akuma_issues_12_comments-45.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4831",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"736c00f3d218b488033ab06ef3201370\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5F2:726A97:5E5090EA"
+    }
+  },
+  "uuid": "ff723ca0-048e-4130-88c0-b41efb22f9b5",
+  "persistent": true,
+  "insertionIndex": 45
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36-5875b8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36-5875b8.json
deleted file mode 100644
index 6e0a8bc848..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36-5875b8.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "5875b84c-e475-46be-a356-e6a6384d16fc",
-  "name": "repos_kohsuke_args4j_issues_138_comments",
-  "request": {
-    "url": "/repos/kohsuke/args4j/issues/138/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_args4j_issues_138_comments-5875b84c-e475-46be-a356-e6a6384d16fc.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4840",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"05bc78b9de9ff1d8359e342beeb660a0\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5BC:726A54:5E5090E8"
-    }
-  },
-  "uuid": "5875b84c-e475-46be-a356-e6a6384d16fc",
-  "persistent": true,
-  "insertionIndex": 36
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36.json
new file mode 100644
index 0000000000..829e6df15d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_138_comments-36.json
@@ -0,0 +1,47 @@
+{
+  "id": "5875b84c-e475-46be-a356-e6a6384d16fc",
+  "name": "repos_kohsuke_args4j_issues_138_comments",
+  "request": {
+    "url": "/repos/kohsuke/args4j/issues/138/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_args4j_issues_138_comments-36.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4840",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"05bc78b9de9ff1d8359e342beeb660a0\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5BC:726A54:5E5090E8"
+    }
+  },
+  "uuid": "5875b84c-e475-46be-a356-e6a6384d16fc",
+  "persistent": true,
+  "insertionIndex": 36
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37-e2c50d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37-e2c50d.json
deleted file mode 100644
index e5d729d8d6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37-e2c50d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "e2c50d75-bd6b-4352-95b7-c6a16edac6cf",
-  "name": "repos_kohsuke_args4j_issues_151_comments",
-  "request": {
-    "url": "/repos/kohsuke/args4j/issues/151/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_args4j_issues_151_comments-e2c50d75-bd6b-4352-95b7-c6a16edac6cf.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4839",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"053c150772465d4ff8ab89d0b0417ec6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5BE:726A58:5E5090E9"
-    }
-  },
-  "uuid": "e2c50d75-bd6b-4352-95b7-c6a16edac6cf",
-  "persistent": true,
-  "insertionIndex": 37
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37.json
new file mode 100644
index 0000000000..e610ddb907
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_151_comments-37.json
@@ -0,0 +1,47 @@
+{
+  "id": "e2c50d75-bd6b-4352-95b7-c6a16edac6cf",
+  "name": "repos_kohsuke_args4j_issues_151_comments",
+  "request": {
+    "url": "/repos/kohsuke/args4j/issues/151/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_args4j_issues_151_comments-37.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4839",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"053c150772465d4ff8ab89d0b0417ec6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5BE:726A58:5E5090E9"
+    }
+  },
+  "uuid": "e2c50d75-bd6b-4352-95b7-c6a16edac6cf",
+  "persistent": true,
+  "insertionIndex": 37
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_163_comments-26-e856f0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_163_comments-26.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_163_comments-26-e856f0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_163_comments-26.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13-7037b3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13-7037b3.json
deleted file mode 100644
index 0f23371747..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13-7037b3.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "7037b3d3-30bb-473d-a3b7-287381648ac1",
-  "name": "repos_kohsuke_args4j_issues_170_comments",
-  "request": {
-    "url": "/repos/kohsuke/args4j/issues/170/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_args4j_issues_170_comments-7037b3d3-30bb-473d-a3b7-287381648ac1.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4862",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a9669a1fa50ee62d67657c7679228c9e\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4E4:72694B:5E5090E2"
-    }
-  },
-  "uuid": "7037b3d3-30bb-473d-a3b7-287381648ac1",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13.json
new file mode 100644
index 0000000000..a1c1d854b2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_args4j_issues_170_comments-13.json
@@ -0,0 +1,47 @@
+{
+  "id": "7037b3d3-30bb-473d-a3b7-287381648ac1",
+  "name": "repos_kohsuke_args4j_issues_170_comments",
+  "request": {
+    "url": "/repos/kohsuke/args4j/issues/170/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_args4j_issues_170_comments-13.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4862",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a9669a1fa50ee62d67657c7679228c9e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4E4:72694B:5E5090E2"
+    }
+  },
+  "uuid": "7037b3d3-30bb-473d-a3b7-287381648ac1",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43-a8438c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43-a8438c.json
deleted file mode 100644
index 543a1a78bd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43-a8438c.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "a8438cec-832d-4a65-8972-42add8eed66b",
-  "name": "repos_kohsuke_com4j_issues_58_comments",
-  "request": {
-    "url": "/repos/kohsuke/com4j/issues/58/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_com4j_issues_58_comments-a8438cec-832d-4a65-8972-42add8eed66b.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4833",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a381fd6828727662908b0934fa5cbe39\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5DE:726A7F:5E5090EA"
-    }
-  },
-  "uuid": "a8438cec-832d-4a65-8972-42add8eed66b",
-  "persistent": true,
-  "insertionIndex": 43
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43.json
new file mode 100644
index 0000000000..4e7d98b80f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_com4j_issues_58_comments-43.json
@@ -0,0 +1,47 @@
+{
+  "id": "a8438cec-832d-4a65-8972-42add8eed66b",
+  "name": "repos_kohsuke_com4j_issues_58_comments",
+  "request": {
+    "url": "/repos/kohsuke/com4j/issues/58/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_com4j_issues_58_comments-43.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4833",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a381fd6828727662908b0934fa5cbe39\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5DE:726A7F:5E5090EA"
+    }
+  },
+  "uuid": "a8438cec-832d-4a65-8972-42add8eed66b",
+  "persistent": true,
+  "insertionIndex": 43
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47-05248c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47-05248c.json
deleted file mode 100644
index 5e68d39fd3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47-05248c.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "05248ca7-2309-4eb3-934c-74d670a3a6eb",
-  "name": "repos_kohsuke_cucumber-annotation-indexer_issues_1_comments",
-  "request": {
-    "url": "/repos/kohsuke/cucumber-annotation-indexer/issues/1/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-05248ca7-2309-4eb3-934c-74d670a3a6eb.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4829",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"4f0ed7618a39cd7dd3c1458216d0b1d6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5FF:726AA3:5E5090EB"
-    }
-  },
-  "uuid": "05248ca7-2309-4eb3-934c-74d670a3a6eb",
-  "persistent": true,
-  "insertionIndex": 47
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json
new file mode 100644
index 0000000000..5de7bb5dbb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json
@@ -0,0 +1,47 @@
+{
+  "id": "05248ca7-2309-4eb3-934c-74d670a3a6eb",
+  "name": "repos_kohsuke_cucumber-annotation-indexer_issues_1_comments",
+  "request": {
+    "url": "/repos/kohsuke/cucumber-annotation-indexer/issues/1/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_cucumber-annotation-indexer_issues_1_comments-47.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4829",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"4f0ed7618a39cd7dd3c1458216d0b1d6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5FF:726AA3:5E5090EB"
+    }
+  },
+  "uuid": "05248ca7-2309-4eb3-934c-74d670a3a6eb",
+  "persistent": true,
+  "insertionIndex": 47
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14-8e7dee.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14-8e7dee.json
deleted file mode 100644
index c1d4f94cc6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14-8e7dee.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "8e7dee31-69ea-4ac3-9894-b2df06f9967f",
-  "name": "repos_kohsuke_file-leak-detector_issues_48_comments",
-  "request": {
-    "url": "/repos/kohsuke/file-leak-detector/issues/48/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_file-leak-detector_issues_48_comments-8e7dee31-69ea-4ac3-9894-b2df06f9967f.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4861",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"4bece5e1b5bc8455c175c42a82603f5f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4EF:726957:5E5090E3"
-    }
-  },
-  "uuid": "8e7dee31-69ea-4ac3-9894-b2df06f9967f",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14.json
new file mode 100644
index 0000000000..bd02cf0051
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_file-leak-detector_issues_48_comments-14.json
@@ -0,0 +1,47 @@
+{
+  "id": "8e7dee31-69ea-4ac3-9894-b2df06f9967f",
+  "name": "repos_kohsuke_file-leak-detector_issues_48_comments",
+  "request": {
+    "url": "/repos/kohsuke/file-leak-detector/issues/48/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_file-leak-detector_issues_48_comments-14.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4861",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"4bece5e1b5bc8455c175c42a82603f5f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4EF:726957:5E5090E3"
+    }
+  },
+  "uuid": "8e7dee31-69ea-4ac3-9894-b2df06f9967f",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48-6785e2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48-6785e2.json
deleted file mode 100644
index 0476fc9b08..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48-6785e2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "6785e2b0-ef61-4233-9fac-998b581bf5a4",
-  "name": "repos_kohsuke_j-interop_issues_3_comments",
-  "request": {
-    "url": "/repos/kohsuke/j-interop/issues/3/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_j-interop_issues_3_comments-6785e2b0-ef61-4233-9fac-998b581bf5a4.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4828",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"89669292adadf18ac66c3d2110435c9a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF606:726AAA:5E5090EB"
-    }
-  },
-  "uuid": "6785e2b0-ef61-4233-9fac-998b581bf5a4",
-  "persistent": true,
-  "insertionIndex": 48
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48.json
new file mode 100644
index 0000000000..2da184263d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_j-interop_issues_3_comments-48.json
@@ -0,0 +1,47 @@
+{
+  "id": "6785e2b0-ef61-4233-9fac-998b581bf5a4",
+  "name": "repos_kohsuke_j-interop_issues_3_comments",
+  "request": {
+    "url": "/repos/kohsuke/j-interop/issues/3/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_j-interop_issues_3_comments-48.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4828",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"89669292adadf18ac66c3d2110435c9a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF606:726AAA:5E5090EB"
+    }
+  },
+  "uuid": "6785e2b0-ef61-4233-9fac-998b581bf5a4",
+  "persistent": true,
+  "insertionIndex": 48
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30-902180.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30-902180.json
deleted file mode 100644
index b2334e3487..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30-902180.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "902180ec-5fe6-44fc-95e6-bc1c994a895c",
-  "name": "repos_kohsuke_libpam4j_issues_12_comments",
-  "request": {
-    "url": "/repos/kohsuke/libpam4j/issues/12/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_libpam4j_issues_12_comments-902180ec-5fe6-44fc-95e6-bc1c994a895c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4845",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"beeb9189bbb4fa7b19a67d82ce316856\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF564:7269EA:5E5090E6"
-    }
-  },
-  "uuid": "902180ec-5fe6-44fc-95e6-bc1c994a895c",
-  "persistent": true,
-  "insertionIndex": 30
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30.json
new file mode 100644
index 0000000000..92e686b54c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_12_comments-30.json
@@ -0,0 +1,47 @@
+{
+  "id": "902180ec-5fe6-44fc-95e6-bc1c994a895c",
+  "name": "repos_kohsuke_libpam4j_issues_12_comments",
+  "request": {
+    "url": "/repos/kohsuke/libpam4j/issues/12/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_libpam4j_issues_12_comments-30.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4845",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"beeb9189bbb4fa7b19a67d82ce316856\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF564:7269EA:5E5090E6"
+    }
+  },
+  "uuid": "902180ec-5fe6-44fc-95e6-bc1c994a895c",
+  "persistent": true,
+  "insertionIndex": 30
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_23_comments-20-1736fb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_23_comments-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_23_comments-20-1736fb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_23_comments-20.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_24_comments-18-ca102d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_24_comments-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_24_comments-18-ca102d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_libpam4j_issues_24_comments-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15-4d459f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15-4d459f.json
deleted file mode 100644
index ab28b6202e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15-4d459f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "4d459f11-3522-44d2-b3df-68833ac7d17f",
-  "name": "repos_kohsuke_localizer_issues_7_comments",
-  "request": {
-    "url": "/repos/kohsuke/localizer/issues/7/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_localizer_issues_7_comments-4d459f11-3522-44d2-b3df-68833ac7d17f.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4860",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"313121dedb83c877fcc59c2975da9ec5\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4F3:726962:5E5090E3"
-    }
-  },
-  "uuid": "4d459f11-3522-44d2-b3df-68833ac7d17f",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15.json
new file mode 100644
index 0000000000..9245cb5f5e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_localizer_issues_7_comments-15.json
@@ -0,0 +1,47 @@
+{
+  "id": "4d459f11-3522-44d2-b3df-68833ac7d17f",
+  "name": "repos_kohsuke_localizer_issues_7_comments",
+  "request": {
+    "url": "/repos/kohsuke/localizer/issues/7/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_localizer_issues_7_comments-15.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4860",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"313121dedb83c877fcc59c2975da9ec5\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4F3:726962:5E5090E3"
+    }
+  },
+  "uuid": "4d459f11-3522-44d2-b3df-68833ac7d17f",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40-a09ab6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40-a09ab6.json
deleted file mode 100644
index 6ef5cd0356..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40-a09ab6.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "a09ab691-cab7-4a08-9d01-9e83aaa1e8d7",
-  "name": "repos_kohsuke_mimepull_issues_2_comments",
-  "request": {
-    "url": "/repos/kohsuke/mimepull/issues/2/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_mimepull_issues_2_comments-a09ab691-cab7-4a08-9d01-9e83aaa1e8d7.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4836",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9273f45c46ad30bb58839e52510cd5d6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5CE:726A69:5E5090E9"
-    }
-  },
-  "uuid": "a09ab691-cab7-4a08-9d01-9e83aaa1e8d7",
-  "persistent": true,
-  "insertionIndex": 40
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40.json
new file mode 100644
index 0000000000..8f827e46d0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_mimepull_issues_2_comments-40.json
@@ -0,0 +1,47 @@
+{
+  "id": "a09ab691-cab7-4a08-9d01-9e83aaa1e8d7",
+  "name": "repos_kohsuke_mimepull_issues_2_comments",
+  "request": {
+    "url": "/repos/kohsuke/mimepull/issues/2/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_mimepull_issues_2_comments-40.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4836",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9273f45c46ad30bb58839e52510cd5d6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5CE:726A69:5E5090E9"
+    }
+  },
+  "uuid": "a09ab691-cab7-4a08-9d01-9e83aaa1e8d7",
+  "persistent": true,
+  "insertionIndex": 40
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_40_comments-42-2b6799.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_40_comments-42.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_40_comments-42-2b6799.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_40_comments-42.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23-ce501b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23-ce501b.json
deleted file mode 100644
index 178b82604f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23-ce501b.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ce501b97-f7fc-48e2-92f2-39d37ad03b0c",
-  "name": "repos_kohsuke_winp_issues_64_comments",
-  "request": {
-    "url": "/repos/kohsuke/winp/issues/64/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_winp_issues_64_comments-ce501b97-f7fc-48e2-92f2-39d37ad03b0c.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4852",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a0ce30c3b2716f0f71e1e340219f5d2f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF522:726997:5E5090E5"
-    }
-  },
-  "uuid": "ce501b97-f7fc-48e2-92f2-39d37ad03b0c",
-  "persistent": true,
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23.json
new file mode 100644
index 0000000000..2893352d74
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winp_issues_64_comments-23.json
@@ -0,0 +1,47 @@
+{
+  "id": "ce501b97-f7fc-48e2-92f2-39d37ad03b0c",
+  "name": "repos_kohsuke_winp_issues_64_comments",
+  "request": {
+    "url": "/repos/kohsuke/winp/issues/64/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_winp_issues_64_comments-23.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4852",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a0ce30c3b2716f0f71e1e340219f5d2f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF522:726997:5E5090E5"
+    }
+  },
+  "uuid": "ce501b97-f7fc-48e2-92f2-39d37ad03b0c",
+  "persistent": true,
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35-e75ddc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35-e75ddc.json
deleted file mode 100644
index 2d9351d367..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35-e75ddc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "e75ddcfb-3e74-4d2a-9372-3bf43f0acea0",
-  "name": "repos_kohsuke_winsw_issues_199_comments",
-  "request": {
-    "url": "/repos/kohsuke/winsw/issues/199/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_winsw_issues_199_comments-e75ddcfb-3e74-4d2a-9372-3bf43f0acea0.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4841",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"1a1b4224f42d6831b528b047275a8db9\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5B4:726A49:5E5090E8"
-    }
-  },
-  "uuid": "e75ddcfb-3e74-4d2a-9372-3bf43f0acea0",
-  "persistent": true,
-  "insertionIndex": 35
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35.json
new file mode 100644
index 0000000000..5bcaf7e741
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_199_comments-35.json
@@ -0,0 +1,47 @@
+{
+  "id": "e75ddcfb-3e74-4d2a-9372-3bf43f0acea0",
+  "name": "repos_kohsuke_winsw_issues_199_comments",
+  "request": {
+    "url": "/repos/kohsuke/winsw/issues/199/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_winsw_issues_199_comments-35.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4841",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"1a1b4224f42d6831b528b047275a8db9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5B4:726A49:5E5090E8"
+    }
+  },
+  "uuid": "e75ddcfb-3e74-4d2a-9372-3bf43f0acea0",
+  "persistent": true,
+  "insertionIndex": 35
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22-637246.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22-637246.json
deleted file mode 100644
index f6a8737ee7..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22-637246.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "6372463b-b035-44ab-aa19-f95c2dda08e9",
-  "name": "repos_kohsuke_winsw_issues_288_comments",
-  "request": {
-    "url": "/repos/kohsuke/winsw/issues/288/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_winsw_issues_288_comments-6372463b-b035-44ab-aa19-f95c2dda08e9.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4853",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"277692782ddd26642e3827d138ad3c79\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF519:726991:5E5090E4"
-    }
-  },
-  "uuid": "6372463b-b035-44ab-aa19-f95c2dda08e9",
-  "persistent": true,
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22.json
new file mode 100644
index 0000000000..ab101c1882
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_288_comments-22.json
@@ -0,0 +1,47 @@
+{
+  "id": "6372463b-b035-44ab-aa19-f95c2dda08e9",
+  "name": "repos_kohsuke_winsw_issues_288_comments",
+  "request": {
+    "url": "/repos/kohsuke/winsw/issues/288/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_winsw_issues_288_comments-22.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4853",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"277692782ddd26642e3827d138ad3c79\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF519:726991:5E5090E4"
+    }
+  },
+  "uuid": "6372463b-b035-44ab-aa19-f95c2dda08e9",
+  "persistent": true,
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8-92f2c6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8-92f2c6.json
deleted file mode 100644
index 4f265a2a31..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8-92f2c6.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "92f2c6c5-159c-4d8d-8c1b-a685e1a346a3",
-  "name": "repos_kohsuke_winsw_issues_348_comments",
-  "request": {
-    "url": "/repos/kohsuke/winsw/issues/348/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_winsw_issues_348_comments-92f2c6c5-159c-4d8d-8c1b-a685e1a346a3.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4867",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"5bdbd17c6940fe897e95191790042a59\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4C8:726931:5E5090E1"
-    }
-  },
-  "uuid": "92f2c6c5-159c-4d8d-8c1b-a685e1a346a3",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8.json
new file mode 100644
index 0000000000..3c51b63d4c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_348_comments-8.json
@@ -0,0 +1,47 @@
+{
+  "id": "92f2c6c5-159c-4d8d-8c1b-a685e1a346a3",
+  "name": "repos_kohsuke_winsw_issues_348_comments",
+  "request": {
+    "url": "/repos/kohsuke/winsw/issues/348/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_winsw_issues_348_comments-8.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4867",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"5bdbd17c6940fe897e95191790042a59\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4C8:726931:5E5090E1"
+    }
+  },
+  "uuid": "92f2c6c5-159c-4d8d-8c1b-a685e1a346a3",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5-592b0c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5-592b0c.json
deleted file mode 100644
index f09f4ea87d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5-592b0c.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "592b0cc1-594f-4d29-9f48-154c9dbbccea",
-  "name": "repos_kohsuke_winsw_issues_401_comments",
-  "request": {
-    "url": "/repos/kohsuke/winsw/issues/401/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_winsw_issues_401_comments-592b0cc1-594f-4d29-9f48-154c9dbbccea.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4870",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"3e31f67d2be70da10b4e68ad28488894\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF4B5:72691C:5E5090E1"
-    }
-  },
-  "uuid": "592b0cc1-594f-4d29-9f48-154c9dbbccea",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5.json
new file mode 100644
index 0000000000..6eb9c4d6f5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_401_comments-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "592b0cc1-594f-4d29-9f48-154c9dbbccea",
+  "name": "repos_kohsuke_winsw_issues_401_comments",
+  "request": {
+    "url": "/repos/kohsuke/winsw/issues/401/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_winsw_issues_401_comments-5.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4870",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"3e31f67d2be70da10b4e68ad28488894\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF4B5:72691C:5E5090E1"
+    }
+  },
+  "uuid": "592b0cc1-594f-4d29-9f48-154c9dbbccea",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_79_comments-6-0db23c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_79_comments-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_79_comments-6-0db23c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_kohsuke_winsw_issues_79_comments-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50-f2e8ce.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50-f2e8ce.json
deleted file mode 100644
index 00dfda6f58..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50-f2e8ce.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "f2e8ce53-9c07-4118-be54-55ea43212f64",
-  "name": "repos_mojohaus_animal-sniffer_issues_9_comments",
-  "request": {
-    "url": "/repos/mojohaus/animal-sniffer/issues/9/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_mojohaus_animal-sniffer_issues_9_comments-f2e8ce53-9c07-4118-be54-55ea43212f64.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4826",
-      "X-RateLimit-Reset": "1582341553",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"291445e81813bb820ec7127f7954ebe2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF614:726ABA:5E5090EB"
-    }
-  },
-  "uuid": "f2e8ce53-9c07-4118-be54-55ea43212f64",
-  "persistent": true,
-  "insertionIndex": 50
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50.json
new file mode 100644
index 0000000000..dfbbe716cd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_mojohaus_animal-sniffer_issues_9_comments-50.json
@@ -0,0 +1,47 @@
+{
+  "id": "f2e8ce53-9c07-4118-be54-55ea43212f64",
+  "name": "repos_mojohaus_animal-sniffer_issues_9_comments",
+  "request": {
+    "url": "/repos/mojohaus/animal-sniffer/issues/9/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_mojohaus_animal-sniffer_issues_9_comments-50.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4826",
+      "X-RateLimit-Reset": "1582341553",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"291445e81813bb820ec7127f7954ebe2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF614:726ABA:5E5090EB"
+    }
+  },
+  "uuid": "f2e8ce53-9c07-4118-be54-55ea43212f64",
+  "persistent": true,
+  "insertionIndex": 50
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44-598061.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44-598061.json
deleted file mode 100644
index ba847b1975..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44-598061.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "5980616e-a5c0-4060-9d8c-7272da82fb74",
-  "name": "repos_oracle_opengrok_issues_966_comments",
-  "request": {
-    "url": "/repos/oracle/opengrok/issues/966/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_oracle_opengrok_issues_966_comments-5980616e-a5c0-4060-9d8c-7272da82fb74.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4832",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"822c0ec2842da6f78b753cbea0d6b0de\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF5ED:726A8A:5E5090EA"
-    }
-  },
-  "uuid": "5980616e-a5c0-4060-9d8c-7272da82fb74",
-  "persistent": true,
-  "insertionIndex": 44
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44.json
new file mode 100644
index 0000000000..675f6ce176
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_oracle_opengrok_issues_966_comments-44.json
@@ -0,0 +1,47 @@
+{
+  "id": "5980616e-a5c0-4060-9d8c-7272da82fb74",
+  "name": "repos_oracle_opengrok_issues_966_comments",
+  "request": {
+    "url": "/repos/oracle/opengrok/issues/966/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_oracle_opengrok_issues_966_comments-44.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4832",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"822c0ec2842da6f78b753cbea0d6b0de\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF5ED:726A8A:5E5090EA"
+    }
+  },
+  "uuid": "5980616e-a5c0-4060-9d8c-7272da82fb74",
+  "persistent": true,
+  "insertionIndex": 44
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53-aa901e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53-aa901e.json
deleted file mode 100644
index 36a456dbbb..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53-aa901e.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "aa901e2c-ed25-4848-b60a-d8b6be3ed996",
-  "name": "repos_salesforcelabs_forcepad_issues_25_comments",
-  "request": {
-    "url": "/repos/SalesforceLabs/ForcePad/issues/25/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_salesforcelabs_forcepad_issues_25_comments-aa901e2c-ed25-4848-b60a-d8b6be3ed996.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4823",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"5b11e754fe14db61995f1b9f9b2cdfab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF629:726AD3:5E5090EC"
-    }
-  },
-  "uuid": "aa901e2c-ed25-4848-b60a-d8b6be3ed996",
-  "persistent": true,
-  "insertionIndex": 53
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53.json
new file mode 100644
index 0000000000..d3d019dc11
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_salesforcelabs_forcepad_issues_25_comments-53.json
@@ -0,0 +1,47 @@
+{
+  "id": "aa901e2c-ed25-4848-b60a-d8b6be3ed996",
+  "name": "repos_salesforcelabs_forcepad_issues_25_comments",
+  "request": {
+    "url": "/repos/SalesforceLabs/ForcePad/issues/25/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_salesforcelabs_forcepad_issues_25_comments-53.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4823",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"5b11e754fe14db61995f1b9f9b2cdfab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF629:726AD3:5E5090EC"
+    }
+  },
+  "uuid": "aa901e2c-ed25-4848-b60a-d8b6be3ed996",
+  "persistent": true,
+  "insertionIndex": 53
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52-d9b771.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52-d9b771.json
deleted file mode 100644
index 90505eddd6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52-d9b771.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "d9b77135-2860-4595-ac00-01203f426501",
-  "name": "repos_voxpupuli_puppet-jenkins_issues_110_comments",
-  "request": {
-    "url": "/repos/voxpupuli/puppet-jenkins/issues/110/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_voxpupuli_puppet-jenkins_issues_110_comments-d9b77135-2860-4595-ac00-01203f426501.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4824",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"bbf1158da5a6791280dde31496b72e48\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF61F:726AC6:5E5090EC"
-    }
-  },
-  "uuid": "d9b77135-2860-4595-ac00-01203f426501",
-  "persistent": true,
-  "insertionIndex": 52
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json
new file mode 100644
index 0000000000..9713e335a8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json
@@ -0,0 +1,47 @@
+{
+  "id": "d9b77135-2860-4595-ac00-01203f426501",
+  "name": "repos_voxpupuli_puppet-jenkins_issues_110_comments",
+  "request": {
+    "url": "/repos/voxpupuli/puppet-jenkins/issues/110/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_voxpupuli_puppet-jenkins_issues_110_comments-52.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4824",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"bbf1158da5a6791280dde31496b72e48\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF61F:726AC6:5E5090EC"
+    }
+  },
+  "uuid": "d9b77135-2860-4595-ac00-01203f426501",
+  "persistent": true,
+  "insertionIndex": 52
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2-a3ad60.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2-a3ad60.json
deleted file mode 100644
index 6061ff7ef2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2-a3ad60.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "a3ad6065-e8f9-4470-91cc-ee3982bfb8df",
-  "name": "search_issues",
-  "request": {
-    "url": "/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_issues-a3ad6065-e8f9-4470-91cc-ee3982bfb8df.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "29",
-      "X-RateLimit-Reset": "1582338330",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF415:726834:5E5090DC",
-      "Link": "<https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"next\", <https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "a3ad6065-e8f9-4470-91cc-ee3982bfb8df",
-  "persistent": true,
-  "scenarioName": "scenario-1-search-issues",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-search-issues-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2.json
new file mode 100644
index 0000000000..aa4d44f612
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "a3ad6065-e8f9-4470-91cc-ee3982bfb8df",
+  "name": "search_issues",
+  "request": {
+    "url": "/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_issues-2.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "29",
+      "X-RateLimit-Reset": "1582338330",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF415:726834:5E5090DC",
+      "Link": "<https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"next\", <https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "a3ad6065-e8f9-4470-91cc-ee3982bfb8df",
+  "persistent": true,
+  "scenarioName": "scenario-1-search-issues",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-search-issues-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3-e1b5c1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3-e1b5c1.json
deleted file mode 100644
index 60d50f8926..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3-e1b5c1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "e1b5c11f-4469-4044-9cfc-0529b04bb1c3",
-  "name": "search_issues",
-  "request": {
-    "url": "/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_issues-e1b5c11f-4469-4044-9cfc-0529b04bb1c3.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "28",
-      "X-RateLimit-Reset": "1582338330",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF463:7268AF:5E5090DE",
-      "Link": "<https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"next\", <https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "e1b5c11f-4469-4044-9cfc-0529b04bb1c3",
-  "persistent": true,
-  "scenarioName": "scenario-1-search-issues",
-  "requiredScenarioState": "scenario-1-search-issues-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3.json
new file mode 100644
index 0000000000..af27004c9a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "e1b5c11f-4469-4044-9cfc-0529b04bb1c3",
+  "name": "search_issues",
+  "request": {
+    "url": "/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_issues-3.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "28",
+      "X-RateLimit-Reset": "1582338330",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF463:7268AF:5E5090DE",
+      "Link": "<https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"next\", <https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "e1b5c11f-4469-4044-9cfc-0529b04bb1c3",
+  "persistent": true,
+  "scenarioName": "scenario-1-search-issues",
+  "requiredScenarioState": "scenario-1-search-issues-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34-7e3768.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34-7e3768.json
deleted file mode 100644
index c3cf80a31b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34-7e3768.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "7e3768e1-e5c1-457a-9354-f5d9ef504fc2",
-  "name": "search_issues",
-  "request": {
-    "url": "/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_issues-7e3768e1-e5c1-457a-9354-f5d9ef504fc2.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "27",
-      "X-RateLimit-Reset": "1582338330",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF58A:726A13:5E5090E7",
-      "Link": "<https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=1>; rel=\"prev\", <https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "7e3768e1-e5c1-457a-9354-f5d9ef504fc2",
-  "persistent": true,
-  "insertionIndex": 34
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34.json
new file mode 100644
index 0000000000..ebd33eed64
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/search_issues-34.json
@@ -0,0 +1,44 @@
+{
+  "id": "7e3768e1-e5c1-457a-9354-f5d9ef504fc2",
+  "name": "search_issues",
+  "request": {
+    "url": "/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_issues-34.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "27",
+      "X-RateLimit-Reset": "1582338330",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF58A:726A13:5E5090E7",
+      "Link": "<https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=1>; rel=\"prev\", <https://api.github.com/search/issues?sort=updated&q=mentions%3Akohsuke+is%3Aopen&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "7e3768e1-e5c1-457a-9354-f5d9ef504fc2",
+  "persistent": true,
+  "insertionIndex": 34
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1-b01b82.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1-b01b82.json
deleted file mode 100644
index 63ac00b31e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1-b01b82.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b01b8228-347d-439f-a3f7-db38f3d15881",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b01b8228-347d-439f-a3f7-db38f3d15881.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 02:24:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4873",
-      "X-RateLimit-Reset": "1582341554",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC02:6D35:5FF3EA:72682B:5E5090DB"
-    }
-  },
-  "uuid": "b01b8228-347d-439f-a3f7-db38f3d15881",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1.json
new file mode 100644
index 0000000000..f89f274662
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueSearch/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b01b8228-347d-439f-a3f7-db38f3d15881",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 02:24:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4873",
+      "X-RateLimit-Reset": "1582341554",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC02:6D35:5FF3EA:72682B:5E5090DB"
+    }
+  },
+  "uuid": "b01b8228-347d-439f-a3f7-db38f3d15881",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test-5e93357f-40cc-49ad-90ca-355a4703de1e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test-5e93357f-40cc-49ad-90ca-355a4703de1e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3-805b83e0-61e7-4dc4-844e-a834681cd311.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3-805b83e0-61e7-4dc4-844e-a834681cd311.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3_comments-83d2db1f-2c02-4f03-9bb0-668774dd4f8d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3_comments-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3_comments-83d2db1f-2c02-4f03-9bb0-668774dd4f8d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_3_comments-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_4-d90a1a3e-5992-44bd-bb74-2122878d2da5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_4-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_4-d90a1a3e-5992-44bd-bb74-2122878d2da5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/repos_kohsuke_test_issues_4-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/user-0d50edb7-4ca2-4877-83d1-1617ed206128.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/user-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/user-0d50edb7-4ca2-4877-83d1-1617ed206128.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/__files/user-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1-5e9335.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1-5e9335.json
deleted file mode 100644
index 09d5051fed..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1-5e9335.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5e93357f-40cc-49ad-90ca-355a4703de1e",
-  "name": "repos_kohsuke_test",
-  "request": {
-    "url": "/repos/kohsuke/test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_test-5e93357f-40cc-49ad-90ca-355a4703de1e.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4963",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6e8e35b2d1bc3903a3fb21af412df7f3\"",
-      "Last-Modified": "Tue, 13 Aug 2019 15:00:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2BE:67D1:895A2:A8453:5D95192D"
-    }
-  },
-  "uuid": "5e93357f-40cc-49ad-90ca-355a4703de1e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1.json
new file mode 100644
index 0000000000..f31551870c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "5e93357f-40cc-49ad-90ca-355a4703de1e",
+  "name": "repos_kohsuke_test",
+  "request": {
+    "url": "/repos/kohsuke/test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_test-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4963",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6e8e35b2d1bc3903a3fb21af412df7f3\"",
+      "Last-Modified": "Tue, 13 Aug 2019 15:00:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2BE:67D1:895A2:A8453:5D95192D"
+    }
+  },
+  "uuid": "5e93357f-40cc-49ad-90ca-355a4703de1e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4-805b83.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4-805b83.json
deleted file mode 100644
index ec86712d27..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4-805b83.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "805b83e0-61e7-4dc4-844e-a834681cd311",
-  "name": "repos_kohsuke_test_issues_3",
-  "request": {
-    "url": "/repos/kohsuke/test/issues/3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_test_issues_3-805b83e0-61e7-4dc4-844e-a834681cd311.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4960",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f772a61584fe7a0fe7718e12f57c311f\"",
-      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2BE:67D1:895A8:A8459:5D95192E"
-    }
-  },
-  "uuid": "805b83e0-61e7-4dc4-844e-a834681cd311",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4.json
new file mode 100644
index 0000000000..829ec992c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "805b83e0-61e7-4dc4-844e-a834681cd311",
+  "name": "repos_kohsuke_test_issues_3",
+  "request": {
+    "url": "/repos/kohsuke/test/issues/3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_test_issues_3-4.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4960",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f772a61584fe7a0fe7718e12f57c311f\"",
+      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2BE:67D1:895A8:A8459:5D95192E"
+    }
+  },
+  "uuid": "805b83e0-61e7-4dc4-844e-a834681cd311",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5-83d2db.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5-83d2db.json
deleted file mode 100644
index 7a54651cc8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5-83d2db.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "83d2db1f-2c02-4f03-9bb0-668774dd4f8d",
-  "name": "repos_kohsuke_test_issues_3_comments",
-  "request": {
-    "url": "/repos/kohsuke/test/issues/3/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_test_issues_3_comments-83d2db1f-2c02-4f03-9bb0-668774dd4f8d.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4959",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cc05c56cc032f7cc1c2a98e60bd9d8d7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2BE:67D1:895A9:A845A:5D95192E"
-    }
-  },
-  "uuid": "83d2db1f-2c02-4f03-9bb0-668774dd4f8d",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5.json
new file mode 100644
index 0000000000..bb41f5a307
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_3_comments-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "83d2db1f-2c02-4f03-9bb0-668774dd4f8d",
+  "name": "repos_kohsuke_test_issues_3_comments",
+  "request": {
+    "url": "/repos/kohsuke/test/issues/3/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_test_issues_3_comments-5.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cc05c56cc032f7cc1c2a98e60bd9d8d7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2BE:67D1:895A9:A845A:5D95192E"
+    }
+  },
+  "uuid": "83d2db1f-2c02-4f03-9bb0-668774dd4f8d",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2-d90a1a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2-d90a1a.json
deleted file mode 100644
index dfbfb11c6d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2-d90a1a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d90a1a3e-5992-44bd-bb74-2122878d2da5",
-  "name": "repos_kohsuke_test_issues_4",
-  "request": {
-    "url": "/repos/kohsuke/test/issues/4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_test_issues_4-d90a1a3e-5992-44bd-bb74-2122878d2da5.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1ce4fd2aa953afa3a39653232b50942e\"",
-      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2BE:67D1:895A4:A8455:5D95192E"
-    }
-  },
-  "uuid": "d90a1a3e-5992-44bd-bb74-2122878d2da5",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2.json
new file mode 100644
index 0000000000..f4360975ec
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "d90a1a3e-5992-44bd-bb74-2122878d2da5",
+  "name": "repos_kohsuke_test_issues_4",
+  "request": {
+    "url": "/repos/kohsuke/test/issues/4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_test_issues_4-2.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1ce4fd2aa953afa3a39653232b50942e\"",
+      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2BE:67D1:895A4:A8455:5D95192E"
+    }
+  },
+  "uuid": "d90a1a3e-5992-44bd-bb74-2122878d2da5",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4_comments-3-648b70.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4_comments-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4_comments-3-648b70.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/repos_kohsuke_test_issues_4_comments-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6-0d50ed.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6-0d50ed.json
deleted file mode 100644
index 6bf51d925f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6-0d50ed.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0d50edb7-4ca2-4877-83d1-1617ed206128",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-0d50edb7-4ca2-4877-83d1-1617ed206128.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4798",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F394:361D:FE035C:12E86B2:5D96449D"
-    }
-  },
-  "uuid": "0d50edb7-4ca2-4877-83d1-1617ed206128",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6.json
new file mode 100644
index 0000000000..bb73b38765
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testIssueWithNoComment/mappings/user-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "0d50edb7-4ca2-4877-83d1-1617ed206128",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-6.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4798",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F394:361D:FE035C:12E86B2:5D96449D"
+    }
+  },
+  "uuid": "0d50edb7-4ca2-4877-83d1-1617ed206128",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit-486d8363-a1b1-4e0c-8039-7c760428cddd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit-486d8363-a1b1-4e0c-8039-7c760428cddd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit_commits-82c5e19d-5418-414e-a21e-0325daf45e7b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit_commits-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit_commits-82c5e19d-5418-414e-a21e-0325daf45e7b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/repos_kohsuke_empty-commit_commits-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/user-3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/user-3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/users_kohsuke-8e500715-ba22-4a3d-823c-3be6c7ceb8ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/users_kohsuke-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/users_kohsuke-8e500715-ba22-4a3d-823c-3be6c7ceb8ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/__files/users_kohsuke-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3-486d83.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3-486d83.json
deleted file mode 100644
index 069849480d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3-486d83.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "486d8363-a1b1-4e0c-8039-7c760428cddd",
-  "name": "repos_kohsuke_empty-commit",
-  "request": {
-    "url": "/repos/kohsuke/empty-commit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_empty-commit-486d8363-a1b1-4e0c-8039-7c760428cddd.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4317",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8f2f23c22e05347497f450553c321265\"",
-      "Last-Modified": "Tue, 13 Aug 2019 14:46:42 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE5:05A2:A65AA5:C49F7A:5DB3A143"
-    }
-  },
-  "uuid": "486d8363-a1b1-4e0c-8039-7c760428cddd",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3.json
new file mode 100644
index 0000000000..66f9fe95c2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "486d8363-a1b1-4e0c-8039-7c760428cddd",
+  "name": "repos_kohsuke_empty-commit",
+  "request": {
+    "url": "/repos/kohsuke/empty-commit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_empty-commit-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4317",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8f2f23c22e05347497f450553c321265\"",
+      "Last-Modified": "Tue, 13 Aug 2019 14:46:42 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE5:05A2:A65AA5:C49F7A:5DB3A143"
+    }
+  },
+  "uuid": "486d8363-a1b1-4e0c-8039-7c760428cddd",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4-82c5e1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4-82c5e1.json
deleted file mode 100644
index ab8b17963b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4-82c5e1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "82c5e19d-5418-414e-a21e-0325daf45e7b",
-  "name": "repos_kohsuke_empty-commit_commits",
-  "request": {
-    "url": "/repos/kohsuke/empty-commit/commits",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_empty-commit_commits-82c5e19d-5418-414e-a21e-0325daf45e7b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4316",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b0c2674ef4695ab083023ca04029a25c\"",
-      "Last-Modified": "Thu, 16 Jun 2011 23:07:37 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE5:05A2:A65AAA:C49F80:5DB3A143"
-    }
-  },
-  "uuid": "82c5e19d-5418-414e-a21e-0325daf45e7b",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4.json
new file mode 100644
index 0000000000..713a82221d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/repos_kohsuke_empty-commit_commits-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "82c5e19d-5418-414e-a21e-0325daf45e7b",
+  "name": "repos_kohsuke_empty-commit_commits",
+  "request": {
+    "url": "/repos/kohsuke/empty-commit/commits",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_empty-commit_commits-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4316",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b0c2674ef4695ab083023ca04029a25c\"",
+      "Last-Modified": "Thu, 16 Jun 2011 23:07:37 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE5:05A2:A65AAA:C49F80:5DB3A143"
+    }
+  },
+  "uuid": "82c5e19d-5418-414e-a21e-0325daf45e7b",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1-3c7e63.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1-3c7e63.json
deleted file mode 100644
index 86e35ee69c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1-3c7e63.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4320",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE5:05A2:A65A8D:C49F61:5DB3A143"
-    }
-  },
-  "uuid": "3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1.json
new file mode 100644
index 0000000000..dfc05edd92
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4320",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE5:05A2:A65A8D:C49F61:5DB3A143"
+    }
+  },
+  "uuid": "3c7e63cf-9abe-4572-a0c0-d6a0d416e7e7",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2-8e5007.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2-8e5007.json
deleted file mode 100644
index 1c83af52a2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2-8e5007.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8e500715-ba22-4a3d-823c-3be6c7ceb8ec",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-8e500715-ba22-4a3d-823c-3be6c7ceb8ec.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4318",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
-      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAE5:05A2:A65A9D:C49F6C:5DB3A143"
-    }
-  },
-  "uuid": "8e500715-ba22-4a3d-823c-3be6c7ceb8ec",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2.json
new file mode 100644
index 0000000000..733a979ee8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListCommits/mappings/users_kohsuke-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "8e500715-ba22-4a3d-823c-3be6c7ceb8ec",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4318",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
+      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAE5:05A2:A65A9D:C49F6C:5DB3A143"
+    }
+  },
+  "uuid": "8e500715-ba22-4a3d-823c-3be6c7ceb8ec",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/orgs_github-api-ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/orgs_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/orgs_github-api-ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/orgs_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api-fcfac221-9668-484b-a722-26d83e00a13a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api-fcfac221-9668-484b-a722-26d83e00a13a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api_issues-b87318fd-8120-4fad-8c4d-553dafde3319.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api_issues-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api_issues-b87318fd-8120-4fad-8c4d-553dafde3319.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repos_github-api_github-api_issues-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-b4031b7a-b4c2-4f84-be55-86edaf61cc80.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-b4031b7a-b4c2-4f84-be55-86edaf61cc80.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-f8361bc0-abb8-4880-9da5-e539f0e4b8c8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-f8361bc0-abb8-4880-9da5-e539f0e4b8c8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-6217b760-4265-471f-bbcd-20e198106320.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-6217b760-4265-471f-bbcd-20e198106320.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-4cb18e29-c548-413e-9c74-2c23f77e97a3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-4cb18e29-c548-413e-9c74-2c23f77e97a3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-45f995e6-9f51-4281-8c85-b482a52cffb8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-45f995e6-9f51-4281-8c85-b482a52cffb8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-e299e545-1101-4f9e-851b-a43c6983bd86.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-e299e545-1101-4f9e-851b-a43c6983bd86.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-499826cb-a83b-4bb5-84d9-4d3662c96917.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-499826cb-a83b-4bb5-84d9-4d3662c96917.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-da0634f9-41a1-4bc9-aa50-956fc854efd8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-da0634f9-41a1-4bc9-aa50-956fc854efd8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-fa3775ff-7638-4bf5-b845-5aa41ec8ede9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-fa3775ff-7638-4bf5-b845-5aa41ec8ede9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-22bd53a0-14f4-4ae6-b67d-8bd2a16c354e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-22bd53a0-14f4-4ae6-b67d-8bd2a16c354e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-20.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-e0b920f3-d7a0-489e-8da9-9cbf269654b1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-e0b920f3-d7a0-489e-8da9-9cbf269654b1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-21.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-58ea2313-3d64-4f4f-9692-d9bfb5f39038.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-58ea2313-3d64-4f4f-9692-d9bfb5f39038.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-22.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-90d12de0-8d80-40f1-a54d-646353fb2385.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-90d12de0-8d80-40f1-a54d-646353fb2385.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-23.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-ccbca45e-e252-4d08-a9e0-fe30fb7ebe38.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-ccbca45e-e252-4d08-a9e0-fe30fb7ebe38.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-24.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-f5091cf8-c8b5-4550-833d-2143f23b6a47.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-f5091cf8-c8b5-4550-833d-2143f23b6a47.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-1b4ed16e-84bf-498f-975f-7d945e134452.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-1b4ed16e-84bf-498f-975f-7d945e134452.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-1672447e-5f44-4d04-a88e-e8238b5c6a88.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-1672447e-5f44-4d04-a88e-e8238b5c6a88.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-e381272e-96f7-416e-bb78-b4ad52ab4af4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-e381272e-96f7-416e-bb78-b4ad52ab4af4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-c62bb8d2-e4f6-40e5-9a92-06f6cff0f457.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-c62bb8d2-e4f6-40e5-9a92-06f6cff0f457.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/repositories_617210_issues-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/user-95af3fa7-b1d9-4149-b69c-f69983ac4a7f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/user-95af3fa7-b1d9-4149-b69c-f69983ac4a7f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2-ed7291.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2-ed7291.json
deleted file mode 100644
index c0120895d8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2-ed7291.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff",
-  "name": "orgs_github-api",
-  "request": {
-    "url": "/orgs/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4854",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6c9af7a880f7ec99403ffd293e3705b2\"",
-      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFDB0:C1558F:5E18EB87"
-    }
-  },
-  "uuid": "ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2.json
new file mode 100644
index 0000000000..713f2e4007
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/orgs_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff",
+  "name": "orgs_github-api",
+  "request": {
+    "url": "/orgs/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4854",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6c9af7a880f7ec99403ffd293e3705b2\"",
+      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFDB0:C1558F:5E18EB87"
+    }
+  },
+  "uuid": "ed729156-c4f4-4ae3-ada9-aa0fa8ce0cff",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3-fcfac2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3-fcfac2.json
deleted file mode 100644
index 92b93c3edd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3-fcfac2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fcfac221-9668-484b-a722-26d83e00a13a",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-fcfac221-9668-484b-a722-26d83e00a13a.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4853",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1ad5949631897a0715641013cb1c1c18\"",
-      "Last-Modified": "Fri, 10 Jan 2020 19:14:02 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFDB4:C155AE:5E18EB88"
-    }
-  },
-  "uuid": "fcfac221-9668-484b-a722-26d83e00a13a",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..63c5a9a750
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "fcfac221-9668-484b-a722-26d83e00a13a",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4853",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1ad5949631897a0715641013cb1c1c18\"",
+      "Last-Modified": "Fri, 10 Jan 2020 19:14:02 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFDB4:C155AE:5E18EB88"
+    }
+  },
+  "uuid": "fcfac221-9668-484b-a722-26d83e00a13a",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4-b87318.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4-b87318.json
deleted file mode 100644
index 08ab3aeeca..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4-b87318.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b87318fd-8120-4fad-8c4d-553dafde3319",
-  "name": "repos_github-api_github-api_issues",
-  "request": {
-    "url": "/repos/github-api/github-api/issues?state=closed",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_issues-b87318fd-8120-4fad-8c4d-553dafde3319.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4852",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"948dba2e444df962d7cb990928b64205\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFDC7:C155C2:5E18EB88",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\""
-    }
-  },
-  "uuid": "b87318fd-8120-4fad-8c4d-553dafde3319",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4.json
new file mode 100644
index 0000000000..f264e83a84
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repos_github-api_github-api_issues-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "b87318fd-8120-4fad-8c4d-553dafde3319",
+  "name": "repos_github-api_github-api_issues",
+  "request": {
+    "url": "/repos/github-api/github-api/issues?state=closed",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_issues-4.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4852",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"948dba2e444df962d7cb990928b64205\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFDC7:C155C2:5E18EB88",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\""
+    }
+  },
+  "uuid": "b87318fd-8120-4fad-8c4d-553dafde3319",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10-b4031b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10-b4031b.json
deleted file mode 100644
index cc49402e35..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10-b4031b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b4031b7a-b4c2-4f84-be55-86edaf61cc80",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-b4031b7a-b4c2-4f84-be55-86edaf61cc80.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4846",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f9316a7a27b9b826bf03a81cd943286\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFE73:C15698:5E18EB8C",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "b4031b7a-b4c2-4f84-be55-86edaf61cc80",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10.json
new file mode 100644
index 0000000000..e7e7937f7f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "b4031b7a-b4c2-4f84-be55-86edaf61cc80",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-10.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4846",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f9316a7a27b9b826bf03a81cd943286\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFE73:C15698:5E18EB8C",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "b4031b7a-b4c2-4f84-be55-86edaf61cc80",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11-f8361b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11-f8361b.json
deleted file mode 100644
index b191d8250a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11-f8361b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f8361bc0-abb8-4880-9da5-e539f0e4b8c8",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=8",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-f8361bc0-abb8-4880-9da5-e539f0e4b8c8.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4845",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"74c764b79521cb6b406e9a0c7f0660a8\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFE9D:C156C8:5E18EB8C",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "f8361bc0-abb8-4880-9da5-e539f0e4b8c8",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11.json
new file mode 100644
index 0000000000..c1729af72a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "f8361bc0-abb8-4880-9da5-e539f0e4b8c8",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=8",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-11.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4845",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"74c764b79521cb6b406e9a0c7f0660a8\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFE9D:C156C8:5E18EB8C",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "f8361bc0-abb8-4880-9da5-e539f0e4b8c8",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12-6217b7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12-6217b7.json
deleted file mode 100644
index dc68de6078..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12-6217b7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6217b760-4265-471f-bbcd-20e198106320",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=9",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-6217b760-4265-471f-bbcd-20e198106320.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4844",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c4fa8e4e0e5b37f9fdb5c3bfc7096e21\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFEB1:C156E1:5E18EB8D",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6217b760-4265-471f-bbcd-20e198106320",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12.json
new file mode 100644
index 0000000000..45c5858823
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "6217b760-4265-471f-bbcd-20e198106320",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=9",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-12.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4844",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c4fa8e4e0e5b37f9fdb5c3bfc7096e21\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFEB1:C156E1:5E18EB8D",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=8>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6217b760-4265-471f-bbcd-20e198106320",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13-4cb18e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13-4cb18e.json
deleted file mode 100644
index 221e123424..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13-4cb18e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4cb18e29-c548-413e-9c74-2c23f77e97a3",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-4cb18e29-c548-413e-9c74-2c23f77e97a3.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4843",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be6cb491d402f5f42de57d294d407ab1\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFECD:C156FD:5E18EB8E",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "4cb18e29-c548-413e-9c74-2c23f77e97a3",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13.json
new file mode 100644
index 0000000000..673f7fc279
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "4cb18e29-c548-413e-9c74-2c23f77e97a3",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-13.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4843",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be6cb491d402f5f42de57d294d407ab1\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFECD:C156FD:5E18EB8E",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=9>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "4cb18e29-c548-413e-9c74-2c23f77e97a3",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14-45f995.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14-45f995.json
deleted file mode 100644
index 16277aaeab..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14-45f995.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "45f995e6-9f51-4281-8c85-b482a52cffb8",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=11",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-45f995e6-9f51-4281-8c85-b482a52cffb8.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4842",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4aed0e65d4b6d9740efd5dbb9ee1f247\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFEEE:C1572D:5E18EB8E",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "45f995e6-9f51-4281-8c85-b482a52cffb8",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14.json
new file mode 100644
index 0000000000..01ee3a35ad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-14.json
@@ -0,0 +1,48 @@
+{
+  "id": "45f995e6-9f51-4281-8c85-b482a52cffb8",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=11",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-14.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4842",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4aed0e65d4b6d9740efd5dbb9ee1f247\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFEEE:C1572D:5E18EB8E",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=10>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "45f995e6-9f51-4281-8c85-b482a52cffb8",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15-e299e5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15-e299e5.json
deleted file mode 100644
index c6e822aa4a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15-e299e5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e299e545-1101-4f9e-851b-a43c6983bd86",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=12",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-e299e545-1101-4f9e-851b-a43c6983bd86.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4841",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9c67da3d34d9147673e746400f345b92\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFF0C:C15748:5E18EB8F",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e299e545-1101-4f9e-851b-a43c6983bd86",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15.json
new file mode 100644
index 0000000000..04a635da15
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-15.json
@@ -0,0 +1,48 @@
+{
+  "id": "e299e545-1101-4f9e-851b-a43c6983bd86",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=12",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-15.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4841",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9c67da3d34d9147673e746400f345b92\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFF0C:C15748:5E18EB8F",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=11>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e299e545-1101-4f9e-851b-a43c6983bd86",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16-499826.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16-499826.json
deleted file mode 100644
index d12eafec70..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16-499826.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "499826cb-a83b-4bb5-84d9-4d3662c96917",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=13",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-499826cb-a83b-4bb5-84d9-4d3662c96917.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4840",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbb6765746d6f07ada15c00c70f802b1\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFF20:C15769:5E18EB90",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "499826cb-a83b-4bb5-84d9-4d3662c96917",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16.json
new file mode 100644
index 0000000000..bd8a8a5fa9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-16.json
@@ -0,0 +1,48 @@
+{
+  "id": "499826cb-a83b-4bb5-84d9-4d3662c96917",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=13",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-16.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4840",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbb6765746d6f07ada15c00c70f802b1\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFF20:C15769:5E18EB90",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=12>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "499826cb-a83b-4bb5-84d9-4d3662c96917",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17-da0634.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17-da0634.json
deleted file mode 100644
index 781f140457..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17-da0634.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "da0634f9-41a1-4bc9-aa50-956fc854efd8",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=14",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-da0634f9-41a1-4bc9-aa50-956fc854efd8.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4839",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"969c59ef0c6f3415a912cc5234181c77\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFF3E:C15789:5E18EB90",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "da0634f9-41a1-4bc9-aa50-956fc854efd8",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17.json
new file mode 100644
index 0000000000..354f8f211a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-17.json
@@ -0,0 +1,48 @@
+{
+  "id": "da0634f9-41a1-4bc9-aa50-956fc854efd8",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=14",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-17.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4839",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"969c59ef0c6f3415a912cc5234181c77\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFF3E:C15789:5E18EB90",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=13>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "da0634f9-41a1-4bc9-aa50-956fc854efd8",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18-f4a18f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18-f4a18f.json
deleted file mode 100644
index 4c8bfec002..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18-f4a18f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=15",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4838",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"334a625a16b4bfbfd3a28157dfb5fd6f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFF6F:C157CC:5E18EB91",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98",
-  "persistent": true,
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18.json
new file mode 100644
index 0000000000..d72d27c79d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-18.json
@@ -0,0 +1,48 @@
+{
+  "id": "f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=15",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-18.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4838",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"334a625a16b4bfbfd3a28157dfb5fd6f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFF6F:C157CC:5E18EB91",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=14>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "f4a18f3b-cb31-48d3-8c6b-61c57ec5fd98",
+  "persistent": true,
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19-fa3775.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19-fa3775.json
deleted file mode 100644
index 2d4ada0302..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19-fa3775.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fa3775ff-7638-4bf5-b845-5aa41ec8ede9",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=16",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-fa3775ff-7638-4bf5-b845-5aa41ec8ede9.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4837",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"49a5298d49b753fde6d515cdf29ae3f5\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFF94:C157FC:5E18EB92",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=17>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "fa3775ff-7638-4bf5-b845-5aa41ec8ede9",
-  "persistent": true,
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19.json
new file mode 100644
index 0000000000..80a681f09e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-19.json
@@ -0,0 +1,48 @@
+{
+  "id": "fa3775ff-7638-4bf5-b845-5aa41ec8ede9",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=16",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-19.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4837",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"49a5298d49b753fde6d515cdf29ae3f5\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFF94:C157FC:5E18EB92",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=15>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=17>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "fa3775ff-7638-4bf5-b845-5aa41ec8ede9",
+  "persistent": true,
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20-22bd53.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20-22bd53.json
deleted file mode 100644
index 175f168f25..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20-22bd53.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "22bd53a0-14f4-4ae6-b67d-8bd2a16c354e",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=17",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-22bd53a0-14f4-4ae6-b67d-8bd2a16c354e.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4836",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a10381648ffa2c69f2e8525f33e109b9\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFFB2:C1581A:5E18EB93",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=18>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "22bd53a0-14f4-4ae6-b67d-8bd2a16c354e",
-  "persistent": true,
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20.json
new file mode 100644
index 0000000000..652247604f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-20.json
@@ -0,0 +1,48 @@
+{
+  "id": "22bd53a0-14f4-4ae6-b67d-8bd2a16c354e",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=17",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-20.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4836",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a10381648ffa2c69f2e8525f33e109b9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFFB2:C1581A:5E18EB93",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=16>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=18>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "22bd53a0-14f4-4ae6-b67d-8bd2a16c354e",
+  "persistent": true,
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21-e0b920.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21-e0b920.json
deleted file mode 100644
index d2e0e0e8ed..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21-e0b920.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e0b920f3-d7a0-489e-8da9-9cbf269654b1",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=18",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-e0b920f3-d7a0-489e-8da9-9cbf269654b1.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4835",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f9ccfeaa305abf34bab1229898320691\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFFC7:C1583A:5E18EB93",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=17>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=19>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e0b920f3-d7a0-489e-8da9-9cbf269654b1",
-  "persistent": true,
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21.json
new file mode 100644
index 0000000000..8fc300557f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-21.json
@@ -0,0 +1,48 @@
+{
+  "id": "e0b920f3-d7a0-489e-8da9-9cbf269654b1",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=18",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-21.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4835",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f9ccfeaa305abf34bab1229898320691\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFFC7:C1583A:5E18EB93",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=17>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=19>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e0b920f3-d7a0-489e-8da9-9cbf269654b1",
+  "persistent": true,
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22-58ea23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22-58ea23.json
deleted file mode 100644
index dc4a16b252..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22-58ea23.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "58ea2313-3d64-4f4f-9692-d9bfb5f39038",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=19",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-58ea2313-3d64-4f4f-9692-d9bfb5f39038.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4834",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e63131ba2643ddb219742f564f0bd0e0\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFFE1:C1585E:5E18EB94",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=18>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=20>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "58ea2313-3d64-4f4f-9692-d9bfb5f39038",
-  "persistent": true,
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22.json
new file mode 100644
index 0000000000..b609fd7bcd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-22.json
@@ -0,0 +1,48 @@
+{
+  "id": "58ea2313-3d64-4f4f-9692-d9bfb5f39038",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=19",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-22.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4834",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e63131ba2643ddb219742f564f0bd0e0\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFFE1:C1585E:5E18EB94",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=18>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=20>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "58ea2313-3d64-4f4f-9692-d9bfb5f39038",
+  "persistent": true,
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23-90d12d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23-90d12d.json
deleted file mode 100644
index 3700c4e200..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23-90d12d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "90d12de0-8d80-40f1-a54d-646353fb2385",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=20",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-90d12de0-8d80-40f1-a54d-646353fb2385.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4833",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"54396d8e53a7881ca8fb03b1e6099737\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFFF6:C15876:5E18EB94",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=19>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "90d12de0-8d80-40f1-a54d-646353fb2385",
-  "persistent": true,
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23.json
new file mode 100644
index 0000000000..0b11b1288d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-23.json
@@ -0,0 +1,48 @@
+{
+  "id": "90d12de0-8d80-40f1-a54d-646353fb2385",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=20",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-23.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4833",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"54396d8e53a7881ca8fb03b1e6099737\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFFF6:C15876:5E18EB94",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=19>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "90d12de0-8d80-40f1-a54d-646353fb2385",
+  "persistent": true,
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24-ccbca4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24-ccbca4.json
deleted file mode 100644
index 3f3ffbc342..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24-ccbca4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ccbca45e-e252-4d08-a9e0-fe30fb7ebe38",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=21",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-ccbca45e-e252-4d08-a9e0-fe30fb7ebe38.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4832",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b564b7e836da2bfedd03c24806360540\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9E000E:C15890:5E18EB95",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=20>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "ccbca45e-e252-4d08-a9e0-fe30fb7ebe38",
-  "persistent": true,
-  "insertionIndex": 24
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24.json
new file mode 100644
index 0000000000..eacd0de70c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-24.json
@@ -0,0 +1,48 @@
+{
+  "id": "ccbca45e-e252-4d08-a9e0-fe30fb7ebe38",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=21",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-24.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4832",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b564b7e836da2bfedd03c24806360540\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9E000E:C15890:5E18EB95",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=20>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "ccbca45e-e252-4d08-a9e0-fe30fb7ebe38",
+  "persistent": true,
+  "insertionIndex": 24
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5-f5091c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5-f5091c.json
deleted file mode 100644
index b3aa6032de..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5-f5091c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f5091cf8-c8b5-4550-833d-2143f23b6a47",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-f5091cf8-c8b5-4550-833d-2143f23b6a47.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4851",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c6170f905716e0c868778f37c38ee012\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFDE9:C155E3:5E18EB88",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "f5091cf8-c8b5-4550-833d-2143f23b6a47",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5.json
new file mode 100644
index 0000000000..5d1ae2ec46
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "f5091cf8-c8b5-4550-833d-2143f23b6a47",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-5.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4851",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c6170f905716e0c868778f37c38ee012\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFDE9:C155E3:5E18EB88",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "f5091cf8-c8b5-4550-833d-2143f23b6a47",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6-1b4ed1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6-1b4ed1.json
deleted file mode 100644
index a387371ba2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6-1b4ed1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1b4ed16e-84bf-498f-975f-7d945e134452",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-1b4ed16e-84bf-498f-975f-7d945e134452.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4850",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5eec1629347225a3f3d51b6f6bedd1f9\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFDFC:C15602:5E18EB89",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1b4ed16e-84bf-498f-975f-7d945e134452",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6.json
new file mode 100644
index 0000000000..961ef18581
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "1b4ed16e-84bf-498f-975f-7d945e134452",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-6.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4850",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5eec1629347225a3f3d51b6f6bedd1f9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFDFC:C15602:5E18EB89",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=2>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1b4ed16e-84bf-498f-975f-7d945e134452",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7-167244.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7-167244.json
deleted file mode 100644
index 6051d60a46..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7-167244.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1672447e-5f44-4d04-a88e-e8238b5c6a88",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-1672447e-5f44-4d04-a88e-e8238b5c6a88.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4849",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f8ca460ecceae9eaa7bf7eb280525268\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFE19:C1561B:5E18EB89",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1672447e-5f44-4d04-a88e-e8238b5c6a88",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7.json
new file mode 100644
index 0000000000..bd2c24f5c5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "1672447e-5f44-4d04-a88e-e8238b5c6a88",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-7.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4849",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f8ca460ecceae9eaa7bf7eb280525268\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFE19:C1561B:5E18EB89",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=3>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1672447e-5f44-4d04-a88e-e8238b5c6a88",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8-e38127.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8-e38127.json
deleted file mode 100644
index 420d06e576..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8-e38127.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e381272e-96f7-416e-bb78-b4ad52ab4af4",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-e381272e-96f7-416e-bb78-b4ad52ab4af4.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4848",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf7641a327b5f0be0c7e8cd42236f0a7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFE3B:C15645:5E18EB8A",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e381272e-96f7-416e-bb78-b4ad52ab4af4",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8.json
new file mode 100644
index 0000000000..ccfbbcdcd1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "e381272e-96f7-416e-bb78-b4ad52ab4af4",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-8.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4848",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf7641a327b5f0be0c7e8cd42236f0a7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFE3B:C15645:5E18EB8A",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=4>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=6>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e381272e-96f7-416e-bb78-b4ad52ab4af4",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9-c62bb8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9-c62bb8.json
deleted file mode 100644
index 067f25f08e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9-c62bb8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c62bb8d2-e4f6-40e5-9a92-06f6cff0f457",
-  "name": "repositories_617210_issues",
-  "request": {
-    "url": "/repositories/617210/issues?state=closed&page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_issues-c62bb8d2-e4f6-40e5-9a92-06f6cff0f457.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4847",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"24095aad1db8b826339145f833279ab5\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFE52:C1566A:5E18EB8B",
-      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "c62bb8d2-e4f6-40e5-9a92-06f6cff0f457",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9.json
new file mode 100644
index 0000000000..ccbd283ac6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/repositories_617210_issues-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "c62bb8d2-e4f6-40e5-9a92-06f6cff0f457",
+  "name": "repositories_617210_issues",
+  "request": {
+    "url": "/repositories/617210/issues?state=closed&page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_issues-9.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4847",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"24095aad1db8b826339145f833279ab5\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFE52:C1566A:5E18EB8B",
+      "Link": "<https://api.github.com/repositories/617210/issues?state=closed&page=5>; rel=\"prev\", <https://api.github.com/repositories/617210/issues?state=closed&page=7>; rel=\"next\", <https://api.github.com/repositories/617210/issues?state=closed&page=21>; rel=\"last\", <https://api.github.com/repositories/617210/issues?state=closed&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "c62bb8d2-e4f6-40e5-9a92-06f6cff0f457",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1-95af3f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1-95af3f.json
deleted file mode 100644
index f0ccc1ca28..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1-95af3f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "95af3fa7-b1d9-4149-b69c-f69983ac4a7f",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-95af3fa7-b1d9-4149-b69c-f69983ac4a7f.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:24:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4856",
-      "X-RateLimit-Reset": "1578694895",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CE:7D22:9DFD98:C15589:5E18EB87"
-    }
-  },
-  "uuid": "95af3fa7-b1d9-4149-b69c-f69983ac4a7f",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1.json
new file mode 100644
index 0000000000..80d6b88488
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testListIssues/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "95af3fa7-b1d9-4149-b69c-f69983ac4a7f",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:24:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4856",
+      "X-RateLimit-Reset": "1578694895",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CE:7D22:9DFD98:C15589:5E18EB87"
+    }
+  },
+  "uuid": "95af3fa7-b1d9-4149-b69c-f69983ac4a7f",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbeers-4936bdf6-0a61-48e7-a883-8da9517a5c45.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbeers-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbeers-4936bdf6-0a61-48e7-a883-8da9517a5c45.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbeers-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-769fb685-65e4-479b-9708-73495d1c9493.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-769fb685-65e4-479b-9708-73495d1c9493.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-community-cce9ba85-74cd-435a-82aa-0bd7d00c604e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-community-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-community-cce9ba85-74cd-435a-82aa-0bd7d00c604e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_cloudbees-community-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_infradna-af7edd31-d299-40d9-ae36-c8560bd60268.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_infradna-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_infradna-af7edd31-d299-40d9-ae36-c8560bd60268.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_infradna-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_java-schema-utilities-89ed2c06-4671-48e6-bb63-79188b413e58.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_java-schema-utilities-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_java-schema-utilities-89ed2c06-4671-48e6-bb63-79188b413e58.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_java-schema-utilities-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkins-infra-30e7c1b4-bf52-4737-8229-71038769bfae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkins-infra-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkins-infra-30e7c1b4-bf52-4737-8229-71038769bfae.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkins-infra-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-100ade7d-2083-4ff9-8b1b-2d8648c60b65.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-100ade7d-2083-4ff9-8b1b-2d8648c60b65.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-cert-0a4422be-27ec-4110-9599-166bc51809f2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-cert-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-cert-0a4422be-27ec-4110-9599-166bc51809f2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_jenkinsci-cert-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_legomatterhorn-26ad87d6-e506-4c98-8890-c81a9551aebf.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_legomatterhorn-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_legomatterhorn-26ad87d6-e506-4c98-8890-c81a9551aebf.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_legomatterhorn-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_stapler-e0ce2766-9611-4f1a-91fe-8f53a32132ae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_stapler-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_stapler-e0ce2766-9611-4f1a-91fe-8f53a32132ae.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/orgs_stapler-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/user-f4bfaca9-99e6-47db-9d5c-00a803146d56.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/user-f4bfaca9-99e6-47db-9d5c-00a803146d56.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke-0e40390e-60c3-4161-864a-2587a9b75e8e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke-0e40390e-60c3-4161-864a-2587a9b75e8e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke_orgs-e6c67f05-5a96-4afb-8e7a-030b55572966.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke_orgs-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke_orgs-e6c67f05-5a96-4afb-8e7a-030b55572966.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/__files/users_kohsuke_orgs-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10-4936bd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10-4936bd.json
deleted file mode 100644
index 955d13c812..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10-4936bd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4936bdf6-0a61-48e7-a883-8da9517a5c45",
-  "name": "orgs_cloudbeers",
-  "request": {
-    "url": "/orgs/cloudbeers",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbeers-4936bdf6-0a61-48e7-a883-8da9517a5c45.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4445",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b8a422575e4c0e9c443f2fce88ee64bd\"",
-      "Last-Modified": "Mon, 06 Feb 2017 13:02:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22DF:2393B9:5DB3A101"
-    }
-  },
-  "uuid": "4936bdf6-0a61-48e7-a883-8da9517a5c45",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10.json
new file mode 100644
index 0000000000..004936264d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbeers-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "4936bdf6-0a61-48e7-a883-8da9517a5c45",
+  "name": "orgs_cloudbeers",
+  "request": {
+    "url": "/orgs/cloudbeers",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbeers-10.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4445",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b8a422575e4c0e9c443f2fce88ee64bd\"",
+      "Last-Modified": "Mon, 06 Feb 2017 13:02:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22DF:2393B9:5DB3A101"
+    }
+  },
+  "uuid": "4936bdf6-0a61-48e7-a883-8da9517a5c45",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5-769fb6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5-769fb6.json
deleted file mode 100644
index a27a51a68c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5-769fb6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "769fb685-65e4-479b-9708-73495d1c9493",
-  "name": "orgs_cloudbees",
-  "request": {
-    "url": "/orgs/cloudbees",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees-769fb685-65e4-479b-9708-73495d1c9493.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4450",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"45f4f0823d2f616b5ba0534d081ab4ed\"",
-      "Last-Modified": "Thu, 26 Jul 2018 22:36:42 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22D6:2393B0:5DB3A100"
-    }
-  },
-  "uuid": "769fb685-65e4-479b-9708-73495d1c9493",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5.json
new file mode 100644
index 0000000000..9d5185878a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "769fb685-65e4-479b-9708-73495d1c9493",
+  "name": "orgs_cloudbees",
+  "request": {
+    "url": "/orgs/cloudbees",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees-5.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4450",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"45f4f0823d2f616b5ba0534d081ab4ed\"",
+      "Last-Modified": "Thu, 26 Jul 2018 22:36:42 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22D6:2393B0:5DB3A100"
+    }
+  },
+  "uuid": "769fb685-65e4-479b-9708-73495d1c9493",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9-cce9ba.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9-cce9ba.json
deleted file mode 100644
index f0fb214fa9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9-cce9ba.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cce9ba85-74cd-435a-82aa-0bd7d00c604e",
-  "name": "orgs_cloudbees-community",
-  "request": {
-    "url": "/orgs/CloudBees-community",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees-community-cce9ba85-74cd-435a-82aa-0bd7d00c604e.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4446",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d6241ae59bfbb03c1b325e0d0986ab72\"",
-      "Last-Modified": "Wed, 14 Mar 2018 02:36:46 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22DE:2393B8:5DB3A101"
-    }
-  },
-  "uuid": "cce9ba85-74cd-435a-82aa-0bd7d00c604e",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9.json
new file mode 100644
index 0000000000..9fe8df6a85
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_cloudbees-community-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "cce9ba85-74cd-435a-82aa-0bd7d00c604e",
+  "name": "orgs_cloudbees-community",
+  "request": {
+    "url": "/orgs/CloudBees-community",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees-community-9.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4446",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d6241ae59bfbb03c1b325e0d0986ab72\"",
+      "Last-Modified": "Wed, 14 Mar 2018 02:36:46 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22DE:2393B8:5DB3A101"
+    }
+  },
+  "uuid": "cce9ba85-74cd-435a-82aa-0bd7d00c604e",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6-af7edd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6-af7edd.json
deleted file mode 100644
index 217d73f369..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6-af7edd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "af7edd31-d299-40d9-ae36-c8560bd60268",
-  "name": "orgs_infradna",
-  "request": {
-    "url": "/orgs/infradna",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_infradna-af7edd31-d299-40d9-ae36-c8560bd60268.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4449",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"55bbf93ab6648efea71c848db783547a\"",
-      "Last-Modified": "Fri, 26 Feb 2016 23:08:44 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22D9:2393B4:5DB3A100"
-    }
-  },
-  "uuid": "af7edd31-d299-40d9-ae36-c8560bd60268",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6.json
new file mode 100644
index 0000000000..ecd0adcaee
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_infradna-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "af7edd31-d299-40d9-ae36-c8560bd60268",
+  "name": "orgs_infradna",
+  "request": {
+    "url": "/orgs/infradna",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_infradna-6.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4449",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"55bbf93ab6648efea71c848db783547a\"",
+      "Last-Modified": "Fri, 26 Feb 2016 23:08:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22D9:2393B4:5DB3A100"
+    }
+  },
+  "uuid": "af7edd31-d299-40d9-ae36-c8560bd60268",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8-89ed2c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8-89ed2c.json
deleted file mode 100644
index 1ceeec8e20..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8-89ed2c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "89ed2c06-4671-48e6-bb63-79188b413e58",
-  "name": "orgs_java-schema-utilities",
-  "request": {
-    "url": "/orgs/java-schema-utilities",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_java-schema-utilities-89ed2c06-4671-48e6-bb63-79188b413e58.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4447",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"83d640f7b4f728b6df80f65de2e1878b\"",
-      "Last-Modified": "Sat, 27 Feb 2016 00:05:01 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22DD:2393B7:5DB3A101"
-    }
-  },
-  "uuid": "89ed2c06-4671-48e6-bb63-79188b413e58",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8.json
new file mode 100644
index 0000000000..9aff59e1cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_java-schema-utilities-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "89ed2c06-4671-48e6-bb63-79188b413e58",
+  "name": "orgs_java-schema-utilities",
+  "request": {
+    "url": "/orgs/java-schema-utilities",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_java-schema-utilities-8.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4447",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"83d640f7b4f728b6df80f65de2e1878b\"",
+      "Last-Modified": "Sat, 27 Feb 2016 00:05:01 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22DD:2393B7:5DB3A101"
+    }
+  },
+  "uuid": "89ed2c06-4671-48e6-bb63-79188b413e58",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11-30e7c1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11-30e7c1.json
deleted file mode 100644
index fe6da12982..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11-30e7c1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "30e7c1b4-bf52-4737-8229-71038769bfae",
-  "name": "orgs_jenkins-infra",
-  "request": {
-    "url": "/orgs/jenkins-infra",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra-30e7c1b4-bf52-4737-8229-71038769bfae.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4444",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4df9562660e78d2434cb3b20ec6b4be\"",
-      "Last-Modified": "Tue, 07 Aug 2018 02:50:50 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22E1:2393BB:5DB3A101"
-    }
-  },
-  "uuid": "30e7c1b4-bf52-4737-8229-71038769bfae",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11.json
new file mode 100644
index 0000000000..1819f548b0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkins-infra-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "30e7c1b4-bf52-4737-8229-71038769bfae",
+  "name": "orgs_jenkins-infra",
+  "request": {
+    "url": "/orgs/jenkins-infra",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra-11.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4444",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4df9562660e78d2434cb3b20ec6b4be\"",
+      "Last-Modified": "Tue, 07 Aug 2018 02:50:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22E1:2393BB:5DB3A101"
+    }
+  },
+  "uuid": "30e7c1b4-bf52-4737-8229-71038769bfae",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4-100ade.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4-100ade.json
deleted file mode 100644
index 00d8961ae1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4-100ade.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "100ade7d-2083-4ff9-8b1b-2d8648c60b65",
-  "name": "orgs_jenkinsci",
-  "request": {
-    "url": "/orgs/jenkinsci",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci-100ade7d-2083-4ff9-8b1b-2d8648c60b65.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4451",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ee1dcb6549b6c8fc14267ae3abde8f38\"",
-      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22D5:2393AE:5DB3A100"
-    }
-  },
-  "uuid": "100ade7d-2083-4ff9-8b1b-2d8648c60b65",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4.json
new file mode 100644
index 0000000000..0f474c419a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "100ade7d-2083-4ff9-8b1b-2d8648c60b65",
+  "name": "orgs_jenkinsci",
+  "request": {
+    "url": "/orgs/jenkinsci",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4451",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ee1dcb6549b6c8fc14267ae3abde8f38\"",
+      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22D5:2393AE:5DB3A100"
+    }
+  },
+  "uuid": "100ade7d-2083-4ff9-8b1b-2d8648c60b65",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13-0a4422.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13-0a4422.json
deleted file mode 100644
index 474ae3b888..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13-0a4422.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0a4422be-27ec-4110-9599-166bc51809f2",
-  "name": "orgs_jenkinsci-cert",
-  "request": {
-    "url": "/orgs/jenkinsci-cert",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci-cert-0a4422be-27ec-4110-9599-166bc51809f2.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4442",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aa87936d6efa4071fe65702573059bc4\"",
-      "Last-Modified": "Mon, 06 Aug 2018 23:15:59 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22E3:2393BE:5DB3A102"
-    }
-  },
-  "uuid": "0a4422be-27ec-4110-9599-166bc51809f2",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13.json
new file mode 100644
index 0000000000..05f3c805b3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_jenkinsci-cert-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "0a4422be-27ec-4110-9599-166bc51809f2",
+  "name": "orgs_jenkinsci-cert",
+  "request": {
+    "url": "/orgs/jenkinsci-cert",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci-cert-13.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4442",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aa87936d6efa4071fe65702573059bc4\"",
+      "Last-Modified": "Mon, 06 Aug 2018 23:15:59 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22E3:2393BE:5DB3A102"
+    }
+  },
+  "uuid": "0a4422be-27ec-4110-9599-166bc51809f2",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12-26ad87.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12-26ad87.json
deleted file mode 100644
index a1ae74e94a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12-26ad87.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "26ad87d6-e506-4c98-8890-c81a9551aebf",
-  "name": "orgs_legomatterhorn",
-  "request": {
-    "url": "/orgs/LegoMatterhorn",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_legomatterhorn-26ad87d6-e506-4c98-8890-c81a9551aebf.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4443",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e61206a0e061642c3fa40d78af7c58ec\"",
-      "Last-Modified": "Mon, 13 Oct 2014 00:54:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22E2:2393BD:5DB3A101"
-    }
-  },
-  "uuid": "26ad87d6-e506-4c98-8890-c81a9551aebf",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12.json
new file mode 100644
index 0000000000..daae4b33c7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_legomatterhorn-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "26ad87d6-e506-4c98-8890-c81a9551aebf",
+  "name": "orgs_legomatterhorn",
+  "request": {
+    "url": "/orgs/LegoMatterhorn",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_legomatterhorn-12.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4443",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e61206a0e061642c3fa40d78af7c58ec\"",
+      "Last-Modified": "Mon, 13 Oct 2014 00:54:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22E2:2393BD:5DB3A101"
+    }
+  },
+  "uuid": "26ad87d6-e506-4c98-8890-c81a9551aebf",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7-e0ce27.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7-e0ce27.json
deleted file mode 100644
index 6d20534b70..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7-e0ce27.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e0ce2766-9611-4f1a-91fe-8f53a32132ae",
-  "name": "orgs_stapler",
-  "request": {
-    "url": "/orgs/stapler",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_stapler-e0ce2766-9611-4f1a-91fe-8f53a32132ae.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4448",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d5477d2560a350d4f7dc24afc705f3cb\"",
-      "Last-Modified": "Fri, 14 Oct 2016 18:26:44 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22DB:2393B5:5DB3A101"
-    }
-  },
-  "uuid": "e0ce2766-9611-4f1a-91fe-8f53a32132ae",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7.json
new file mode 100644
index 0000000000..abbc37f7f9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/orgs_stapler-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "e0ce2766-9611-4f1a-91fe-8f53a32132ae",
+  "name": "orgs_stapler",
+  "request": {
+    "url": "/orgs/stapler",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_stapler-7.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4448",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d5477d2560a350d4f7dc24afc705f3cb\"",
+      "Last-Modified": "Fri, 14 Oct 2016 18:26:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22DB:2393B5:5DB3A101"
+    }
+  },
+  "uuid": "e0ce2766-9611-4f1a-91fe-8f53a32132ae",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1-f4bfac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1-f4bfac.json
deleted file mode 100644
index 82c8c56a1a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1-f4bfac.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f4bfaca9-99e6-47db-9d5c-00a803146d56",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f4bfaca9-99e6-47db-9d5c-00a803146d56.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4455",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22CE:2393A5:5DB3A0FF"
-    }
-  },
-  "uuid": "f4bfaca9-99e6-47db-9d5c-00a803146d56",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1.json
new file mode 100644
index 0000000000..20b3a89301
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f4bfaca9-99e6-47db-9d5c-00a803146d56",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4455",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22CE:2393A5:5DB3A0FF"
+    }
+  },
+  "uuid": "f4bfaca9-99e6-47db-9d5c-00a803146d56",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2-0e4039.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2-0e4039.json
deleted file mode 100644
index d672637373..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2-0e4039.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0e40390e-60c3-4161-864a-2587a9b75e8e",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-0e40390e-60c3-4161-864a-2587a9b75e8e.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4453",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
-      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22CF:2393A7:5DB3A0FF"
-    }
-  },
-  "uuid": "0e40390e-60c3-4161-864a-2587a9b75e8e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2.json
new file mode 100644
index 0000000000..df5bac21d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "0e40390e-60c3-4161-864a-2587a9b75e8e",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4453",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"99c27226f3b6139ef2af80ccbcd5d252\"",
+      "Last-Modified": "Fri, 25 Oct 2019 16:53:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22CF:2393A7:5DB3A0FF"
+    }
+  },
+  "uuid": "0e40390e-60c3-4161-864a-2587a9b75e8e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3-e6c67f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3-e6c67f.json
deleted file mode 100644
index 29c0acad86..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3-e6c67f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "e6c67f05-5a96-4afb-8e7a-030b55572966",
-  "name": "users_kohsuke_orgs",
-  "request": {
-    "url": "/users/kohsuke/orgs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke_orgs-e6c67f05-5a96-4afb-8e7a-030b55572966.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4452",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"96c0169e1c02716469175c8dc90085ed\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA87:98FB:1E22D2:2393AB:5DB3A100"
-    }
-  },
-  "uuid": "e6c67f05-5a96-4afb-8e7a-030b55572966",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3.json
new file mode 100644
index 0000000000..2f72307b0f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMemberOrgs/mappings/users_kohsuke_orgs-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "e6c67f05-5a96-4afb-8e7a-030b55572966",
+  "name": "users_kohsuke_orgs",
+  "request": {
+    "url": "/users/kohsuke/orgs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke_orgs-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4452",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"96c0169e1c02716469175c8dc90085ed\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA87:98FB:1E22D2:2393AB:5DB3A100"
+    }
+  },
+  "uuid": "e6c67f05-5a96-4afb-8e7a-030b55572966",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/orgs_github-api-test-org-f298a1b9-4064-46ad-928a-10ea257461d9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/orgs_github-api-test-org-f298a1b9-4064-46ad-928a-10ea257461d9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins-e9db4f2d-55a2-498e-b3eb-d66b87b7b86b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins-e9db4f2d-55a2-498e-b3eb-d66b87b7b86b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins_collaborators-bce97482-6a11-44e5-a112-29230b142636.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins_collaborators-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins_collaborators-bce97482-6a11-44e5-a112-29230b142636.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/repos_github-api-test-org_jenkins_collaborators-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/user-4457eef8-0cad-4b2e-9639-85d62c8c474a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/user-4457eef8-0cad-4b2e-9639-85d62c8c474a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2-f298a1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2-f298a1.json
deleted file mode 100644
index d58dfb71b6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2-f298a1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f298a1b9-4064-46ad-928a-10ea257461d9",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-f298a1b9-4064-46ad-928a-10ea257461d9.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4439",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8B:8340:ED0A49:116E03D:5DB3A102"
-    }
-  },
-  "uuid": "f298a1b9-4064-46ad-928a-10ea257461d9",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..704915883c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f298a1b9-4064-46ad-928a-10ea257461d9",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4439",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8B:8340:ED0A49:116E03D:5DB3A102"
+    }
+  },
+  "uuid": "f298a1b9-4064-46ad-928a-10ea257461d9",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3-e9db4f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3-e9db4f.json
deleted file mode 100644
index 18199cf014..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3-e9db4f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e9db4f2d-55a2-498e-b3eb-d66b87b7b86b",
-  "name": "repos_github-api-test-org_jenkins",
-  "request": {
-    "url": "/repos/github-api-test-org/jenkins",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_jenkins-e9db4f2d-55a2-498e-b3eb-d66b87b7b86b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4438",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"25c097d06bcfe5d2ac907141b83b63cd\"",
-      "Last-Modified": "Fri, 06 Sep 2019 23:21:35 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8B:8340:ED0A5D:116E05D:5DB3A102"
-    }
-  },
-  "uuid": "e9db4f2d-55a2-498e-b3eb-d66b87b7b86b",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3.json
new file mode 100644
index 0000000000..9f9d8c6d32
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "e9db4f2d-55a2-498e-b3eb-d66b87b7b86b",
+  "name": "repos_github-api-test-org_jenkins",
+  "request": {
+    "url": "/repos/github-api-test-org/jenkins",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_jenkins-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4438",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"25c097d06bcfe5d2ac907141b83b63cd\"",
+      "Last-Modified": "Fri, 06 Sep 2019 23:21:35 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8B:8340:ED0A5D:116E05D:5DB3A102"
+    }
+  },
+  "uuid": "e9db4f2d-55a2-498e-b3eb-d66b87b7b86b",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4-bce974.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4-bce974.json
deleted file mode 100644
index f65e3bf072..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4-bce974.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "bce97482-6a11-44e5-a112-29230b142636",
-  "name": "repos_github-api-test-org_jenkins_collaborators",
-  "request": {
-    "url": "/repos/github-api-test-org/jenkins/collaborators",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_jenkins_collaborators-bce97482-6a11-44e5-a112-29230b142636.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4437",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a3be6bffa37c14d7f0232419d0357c86\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8B:8340:ED0A75:116E074:5DB3A103"
-    }
-  },
-  "uuid": "bce97482-6a11-44e5-a112-29230b142636",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4.json
new file mode 100644
index 0000000000..e51bccaff9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/repos_github-api-test-org_jenkins_collaborators-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "bce97482-6a11-44e5-a112-29230b142636",
+  "name": "repos_github-api-test-org_jenkins_collaborators",
+  "request": {
+    "url": "/repos/github-api-test-org/jenkins/collaborators",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_jenkins_collaborators-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4437",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a3be6bffa37c14d7f0232419d0357c86\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8B:8340:ED0A75:116E074:5DB3A103"
+    }
+  },
+  "uuid": "bce97482-6a11-44e5-a112-29230b142636",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1-4457ee.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1-4457ee.json
deleted file mode 100644
index 403fbb3da9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1-4457ee.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4457eef8-0cad-4b2e-9639-85d62c8c474a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-4457eef8-0cad-4b2e-9639-85d62c8c474a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4441",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8B:8340:ED0A37:116E02E:5DB3A102"
-    }
-  },
-  "uuid": "4457eef8-0cad-4b2e-9639-85d62c8c474a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1.json
new file mode 100644
index 0000000000..8db370f359
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMembership/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "4457eef8-0cad-4b2e-9639-85d62c8c474a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4441",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8B:8340:ED0A37:116E02E:5DB3A102"
+    }
+  },
+  "uuid": "4457eef8-0cad-4b2e-9639-85d62c8c474a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user-a4cacc2c-726b-499a-bfdc-302f729fe6c2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user-a4cacc2c-726b-499a-bfdc-302f729fe6c2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user_orgs-2985ea8b-b43b-45ab-b2ce-162ca7bdb55f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user_orgs-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user_orgs-2985ea8b-b43b-45ab-b2ce-162ca7bdb55f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/__files/user_orgs-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2-a4cacc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2-a4cacc.json
deleted file mode 100644
index 17ecbbf478..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2-a4cacc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a4cacc2c-726b-499a-bfdc-302f729fe6c2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a4cacc2c-726b-499a-bfdc-302f729fe6c2.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4801",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F38E:78ED:14A4A9D:1891143:5D96449C"
-    }
-  },
-  "uuid": "a4cacc2c-726b-499a-bfdc-302f729fe6c2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2.json
new file mode 100644
index 0000000000..b46c935e32
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "a4cacc2c-726b-499a-bfdc-302f729fe6c2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4801",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F38E:78ED:14A4A9D:1891143:5D96449C"
+    }
+  },
+  "uuid": "a4cacc2c-726b-499a-bfdc-302f729fe6c2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1-2985ea.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1-2985ea.json
deleted file mode 100644
index 4d82642823..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1-2985ea.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "2985ea8b-b43b-45ab-b2ce-162ca7bdb55f",
-  "name": "user_orgs",
-  "request": {
-    "url": "/user/orgs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_orgs-2985ea8b-b43b-45ab-b2ce-162ca7bdb55f.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:39:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4965",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"03bf52007c5043e8a9dc44a8d12582b8\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2B6:957A:C7FCCC:EECC87:5D95192C"
-    }
-  },
-  "uuid": "2985ea8b-b43b-45ab-b2ce-162ca7bdb55f",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1.json
new file mode 100644
index 0000000000..efb28863b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizations/mappings/user_orgs-1.json
@@ -0,0 +1,47 @@
+{
+  "id": "2985ea8b-b43b-45ab-b2ce-162ca7bdb55f",
+  "name": "user_orgs",
+  "request": {
+    "url": "/user/orgs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_orgs-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:39:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4965",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"03bf52007c5043e8a9dc44a8d12582b8\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2B6:957A:C7FCCC:EECC87:5D95192C"
+    }
+  },
+  "uuid": "2985ea8b-b43b-45ab-b2ce-162ca7bdb55f",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user-fd1c2585-40a5-4ae9-85b5-5ab28ed9379e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user-fd1c2585-40a5-4ae9-85b5-5ab28ed9379e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_orgs-f3813253-5f7d-47c0-91e0-35803e96fe36.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_orgs-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_orgs-f3813253-5f7d-47c0-91e0-35803e96fe36.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_orgs-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_teams-49ff8dab-d286-4880-8c78-367cb7c360a2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_teams-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_teams-49ff8dab-d286-4880-8c78-367cb7c360a2.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/__files/user_teams-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1-fd1c25.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1-fd1c25.json
deleted file mode 100644
index 0ea3aee3c2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1-fd1c25.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fd1c2585-40a5-4ae9-85b5-5ab28ed9379e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-fd1c2585-40a5-4ae9-85b5-5ab28ed9379e.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4788",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F39B:78ED:14A4DF4:1891567:5D9644A3"
-    }
-  },
-  "uuid": "fd1c2585-40a5-4ae9-85b5-5ab28ed9379e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1.json
new file mode 100644
index 0000000000..a72844caae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "fd1c2585-40a5-4ae9-85b5-5ab28ed9379e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4788",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F39B:78ED:14A4DF4:1891567:5D9644A3"
+    }
+  },
+  "uuid": "fd1c2585-40a5-4ae9-85b5-5ab28ed9379e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3-f38132.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3-f38132.json
deleted file mode 100644
index 14a610ab56..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3-f38132.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "f3813253-5f7d-47c0-91e0-35803e96fe36",
-  "name": "user_orgs",
-  "request": {
-    "url": "/user/orgs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_orgs-f3813253-5f7d-47c0-91e0-35803e96fe36.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4785",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"03bf52007c5043e8a9dc44a8d12582b8\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F39B:78ED:14A4E5F:18915DF:5D9644A4"
-    }
-  },
-  "uuid": "f3813253-5f7d-47c0-91e0-35803e96fe36",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3.json
new file mode 100644
index 0000000000..a52962b64a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_orgs-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "f3813253-5f7d-47c0-91e0-35803e96fe36",
+  "name": "user_orgs",
+  "request": {
+    "url": "/user/orgs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_orgs-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4785",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"03bf52007c5043e8a9dc44a8d12582b8\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F39B:78ED:14A4E5F:18915DF:5D9644A4"
+    }
+  },
+  "uuid": "f3813253-5f7d-47c0-91e0-35803e96fe36",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2-49ff8d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2-49ff8d.json
deleted file mode 100644
index fcd2925265..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2-49ff8d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "49ff8dab-d286-4880-8c78-367cb7c360a2",
-  "name": "user_teams",
-  "request": {
-    "url": "/user/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_teams-49ff8dab-d286-4880-8c78-367cb7c360a2.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4786",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"323b6d9443fc5dc67ac0a417d0d0e4bf\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F39B:78ED:14A4E1D:189157C:5D9644A3"
-    }
-  },
-  "uuid": "49ff8dab-d286-4880-8c78-367cb7c360a2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2.json
new file mode 100644
index 0000000000..6aa6c84343
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyOrganizationsContainMyTeams/mappings/user_teams-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "49ff8dab-d286-4880-8c78-367cb7c360a2",
+  "name": "user_teams",
+  "request": {
+    "url": "/user/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_teams-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4786",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"323b6d9443fc5dc67ac0a417d0d0e4bf\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F39B:78ED:14A4E1D:189157C:5D9644A3"
+    }
+  },
+  "uuid": "49ff8dab-d286-4880-8c78-367cb7c360a2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-2fdc0562-25ee-4ff7-8207-444ebbc94abd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-2fdc0562-25ee-4ff7-8207-444ebbc94abd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-864a80f6-b8f4-4a01-bf1b-06d0977753da.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-864a80f6-b8f4-4a01-bf1b-06d0977753da.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-20.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-881e0897-44cd-42c4-88c4-50046ee19a18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-881e0897-44cd-42c4-88c4-50046ee19a18.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-23.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-26.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_107424_teams-26.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-3945b427-290f-4fa2-a720-79cb00ba290e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-35.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-3945b427-290f-4fa2-a720-79cb00ba290e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-35.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-8591cc9c-9c1f-46ab-980f-784ed7ad2b54.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-44.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-8591cc9c-9c1f-46ab-980f-784ed7ad2b54.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-44.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-bed3177f-0cd7-4ebb-acff-67cc43fd2504.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-47.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-bed3177f-0cd7-4ebb-acff-67cc43fd2504.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/organizations_235526_teams-47.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web-62298d74-fe3c-459d-9f70-450e80247969.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web-67.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web-62298d74-fe3c-459d-9f70-450e80247969.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web-67.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web_teams-58684478-ae6b-43c2-b30c-af37aeb81621.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web_teams-68.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web_teams-58684478-ae6b-43c2-b30c-af37aeb81621.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_beautify-web_teams-68.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees-ce8716a4-ec25-4626-9a3a-205e5558bd39.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees-33.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees-ce8716a4-ec25-4626-9a3a-205e5558bd39.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees-33.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-1d3fc4da-c320-4621-bf6c-4fa95aeb487e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-34.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-1d3fc4da-c320-4621-bf6c-4fa95aeb487e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-34.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-35c47636-9b2c-4e43-866a-62d34ddf04fb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-37.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-35c47636-9b2c-4e43-866a-62d34ddf04fb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-37.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-4d6d15f8-8345-4ce7-af12-dcd50335d2c0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-39.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-4d6d15f8-8345-4ce7-af12-dcd50335d2c0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-39.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-57f5eb24-dd30-4d2c-9e6a-90dcd973e21f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-41.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-57f5eb24-dd30-4d2c-9e6a-90dcd973e21f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-41.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-632605dd-2411-4c5d-8fd0-7d57f23cb0a5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-43.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-632605dd-2411-4c5d-8fd0-7d57f23cb0a5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-43.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-c3bba3a6-1c09-4663-bbd5-61f4184faffa.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-46.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-c3bba3a6-1c09-4663-bbd5-61f4184faffa.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-46.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-fbf640ca-c41a-4e82-9c5a-75ba2175bc0c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-49.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-fbf640ca-c41a-4e82-9c5a-75ba2175bc0c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_cloudbees_teams-49.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org-a529986c-70bb-4329-9816-ec1f75673e9c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org-51.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org-a529986c-70bb-4329-9816-ec1f75673e9c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org-51.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-4eeff351-c1bd-449c-bf07-0cd3d013dc9b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-52.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-4eeff351-c1bd-449c-bf07-0cd3d013dc9b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-52.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-c4dada63-33ed-4ac0-856c-e35d466ac7f8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-54.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-c4dada63-33ed-4ac0-856c-e35d466ac7f8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_github-api-test-org_teams-54.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc-e0b11bd2-736d-44c8-aa64-f5848d4691f6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc-30.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc-e0b11bd2-736d-44c8-aa64-f5848d4691f6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc-30.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc_teams-383d61fc-1c69-4ae1-919a-b98b678b47cd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc_teams-31.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc_teams-383d61fc-1c69-4ae1-919a-b98b678b47cd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-inc_teams-31.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra-b7c4f477-4e3a-4505-874e-dd816080c7f4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra-56.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra-b7c4f477-4e3a-4505-874e-dd816080c7f4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra-56.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-196db464-b833-490c-97e4-79f79fe29f07.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-57.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-196db464-b833-490c-97e4-79f79fe29f07.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-57.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-a7f22b01-940f-40f5-9496-f3e0bd87dbf8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-59.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-a7f22b01-940f-40f5-9496-f3e0bd87dbf8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-59.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-b5053ddf-d2f8-4ea4-a246-1118f02f3ac7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-61.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-b5053ddf-d2f8-4ea4-a246-1118f02f3ac7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-61.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-63.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-63.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-f8bd811b-e074-4e0a-b2f3-dc3f749b5c07.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-65.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-f8bd811b-e074-4e0a-b2f3-dc3f749b5c07.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkins-infra_teams-65.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci-eac3f0df-0404-4c43-9864-bf3d6f249294.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci-eac3f0df-0404-4c43-9864-bf3d6f249294.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-0aaf0590-1a5b-4323-8dbc-8fc63b3c5775.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-0aaf0590-1a5b-4323-8dbc-8fc63b3c5775.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-2832b4d6-9274-4137-9421-4855660803ec.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-2832b4d6-9274-4137-9421-4855660803ec.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-421fa98d-71d5-4c1c-a6cb-4f7f301668c7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-421fa98d-71d5-4c1c-a6cb-4f7f301668c7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-4922cdbe-d115-4bb4-94be-4f75c07fc45d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-4922cdbe-d115-4bb4-94be-4f75c07fc45d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-4b9e6062-54b4-41b5-ba0d-9c891b471122.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-4b9e6062-54b4-41b5-ba0d-9c891b471122.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-51a481cc-1f18-4eae-a2c7-3835859468b4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-51a481cc-1f18-4eae-a2c7-3835859468b4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-22.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-7e7d35f3-0e07-4cbb-a814-e363eca72d3d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-25.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-7e7d35f3-0e07-4cbb-a814-e363eca72d3d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-25.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-28.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-28.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-acf98bee-b6c1-4f33-b62e-f86b8d5445fe.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-acf98bee-b6c1-4f33-b62e-f86b8d5445fe.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-bedcaedb-24fc-4a6e-a099-b64fd26d4e97.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-bedcaedb-24fc-4a6e-a099-b64fd26d4e97.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/orgs_jenkinsci_teams-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user-9a793342-57f8-4135-bd51-f0f96e57d45b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user-9a793342-57f8-4135-bd51-f0f96e57d45b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user_teams-d60dafe1-79c4-4212-9544-739b7ee976b9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user_teams-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user_teams-d60dafe1-79c4-4212-9544-739b7ee976b9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/__files/user_teams-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11-bed0fc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11-bed0fc.json
deleted file mode 100644
index 6fe5f8c412..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11-bed0fc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74",
-  "name": "organizations_107424_teams",
-  "request": {
-    "url": "/organizations/107424/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_teams-bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113533:145BEB3:5D96908B",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74",
-  "persistent": true,
-  "scenarioName": "scenario-2-organizations-107424-teams",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-organizations-107424-teams-2",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11.json
new file mode 100644
index 0000000000..ebb8c773e6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-11.json
@@ -0,0 +1,51 @@
+{
+  "id": "bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74",
+  "name": "organizations_107424_teams",
+  "request": {
+    "url": "/organizations/107424/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_teams-11.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4907",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113533:145BEB3:5D96908B",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "bed0fcfe-7ccc-4b9c-aa07-32e6f68f2b74",
+  "persistent": true,
+  "scenarioName": "scenario-2-organizations-107424-teams",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-organizations-107424-teams-2",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20-2fdc05.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20-2fdc05.json
deleted file mode 100644
index 2e20061038..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20-2fdc05.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2fdc0562-25ee-4ff7-8207-444ebbc94abd",
-  "name": "organizations_107424_teams",
-  "request": {
-    "url": "/organizations/107424/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_teams-2fdc0562-25ee-4ff7-8207-444ebbc94abd.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4898",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11135DF:145BF77:5D96908C",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "2fdc0562-25ee-4ff7-8207-444ebbc94abd",
-  "persistent": true,
-  "scenarioName": "scenario-2-organizations-107424-teams",
-  "requiredScenarioState": "scenario-2-organizations-107424-teams-2",
-  "newScenarioState": "scenario-2-organizations-107424-teams-3",
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20.json
new file mode 100644
index 0000000000..3e57ac85a1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-20.json
@@ -0,0 +1,51 @@
+{
+  "id": "2fdc0562-25ee-4ff7-8207-444ebbc94abd",
+  "name": "organizations_107424_teams",
+  "request": {
+    "url": "/organizations/107424/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_teams-20.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4898",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11135DF:145BF77:5D96908C",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "2fdc0562-25ee-4ff7-8207-444ebbc94abd",
+  "persistent": true,
+  "scenarioName": "scenario-2-organizations-107424-teams",
+  "requiredScenarioState": "scenario-2-organizations-107424-teams-2",
+  "newScenarioState": "scenario-2-organizations-107424-teams-3",
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23-864a80.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23-864a80.json
deleted file mode 100644
index 6cb3559a74..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23-864a80.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "864a80f6-b8f4-4a01-bf1b-06d0977753da",
-  "name": "organizations_107424_teams",
-  "request": {
-    "url": "/organizations/107424/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_teams-864a80f6-b8f4-4a01-bf1b-06d0977753da.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4895",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113607:145BFB3:5D96908D",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "864a80f6-b8f4-4a01-bf1b-06d0977753da",
-  "persistent": true,
-  "scenarioName": "scenario-2-organizations-107424-teams",
-  "requiredScenarioState": "scenario-2-organizations-107424-teams-3",
-  "newScenarioState": "scenario-2-organizations-107424-teams-4",
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23.json
new file mode 100644
index 0000000000..bcfe0adaee
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-23.json
@@ -0,0 +1,51 @@
+{
+  "id": "864a80f6-b8f4-4a01-bf1b-06d0977753da",
+  "name": "organizations_107424_teams",
+  "request": {
+    "url": "/organizations/107424/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_teams-23.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4895",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113607:145BFB3:5D96908D",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "864a80f6-b8f4-4a01-bf1b-06d0977753da",
+  "persistent": true,
+  "scenarioName": "scenario-2-organizations-107424-teams",
+  "requiredScenarioState": "scenario-2-organizations-107424-teams-3",
+  "newScenarioState": "scenario-2-organizations-107424-teams-4",
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26-881e08.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26-881e08.json
deleted file mode 100644
index 64792c0f54..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26-881e08.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "881e0897-44cd-42c4-88c4-50046ee19a18",
-  "name": "organizations_107424_teams",
-  "request": {
-    "url": "/organizations/107424/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_teams-881e0897-44cd-42c4-88c4-50046ee19a18.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4892",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113637:145BFE7:5D96908D",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "881e0897-44cd-42c4-88c4-50046ee19a18",
-  "persistent": true,
-  "scenarioName": "scenario-2-organizations-107424-teams",
-  "requiredScenarioState": "scenario-2-organizations-107424-teams-4",
-  "insertionIndex": 26
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26.json
new file mode 100644
index 0000000000..8f0f09c5d6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_107424_teams-26.json
@@ -0,0 +1,50 @@
+{
+  "id": "881e0897-44cd-42c4-88c4-50046ee19a18",
+  "name": "organizations_107424_teams",
+  "request": {
+    "url": "/organizations/107424/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_teams-26.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4892",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6cacce55e59a3baa70e145476fe3279a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113637:145BFE7:5D96908D",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "881e0897-44cd-42c4-88c4-50046ee19a18",
+  "persistent": true,
+  "scenarioName": "scenario-2-organizations-107424-teams",
+  "requiredScenarioState": "scenario-2-organizations-107424-teams-4",
+  "insertionIndex": 26
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35-8591cc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35-8591cc.json
deleted file mode 100644
index dcebca1dd9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35-8591cc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "8591cc9c-9c1f-46ab-980f-784ed7ad2b54",
-  "name": "organizations_235526_teams",
-  "request": {
-    "url": "/organizations/235526/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_235526_teams-8591cc9c-9c1f-46ab-980f-784ed7ad2b54.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4883",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"44c9656011c8da0be5bb1fe95ef18a44\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11136B6:145C080:5D96908E",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\", <https://api.github.com/organizations/235526/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "8591cc9c-9c1f-46ab-980f-784ed7ad2b54",
-  "persistent": true,
-  "scenarioName": "scenario-4-organizations-235526-teams",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-4-organizations-235526-teams-2",
-  "insertionIndex": 35
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35.json
new file mode 100644
index 0000000000..4bf045a0d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-35.json
@@ -0,0 +1,51 @@
+{
+  "id": "8591cc9c-9c1f-46ab-980f-784ed7ad2b54",
+  "name": "organizations_235526_teams",
+  "request": {
+    "url": "/organizations/235526/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_235526_teams-35.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4883",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"44c9656011c8da0be5bb1fe95ef18a44\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11136B6:145C080:5D96908E",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\", <https://api.github.com/organizations/235526/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "8591cc9c-9c1f-46ab-980f-784ed7ad2b54",
+  "persistent": true,
+  "scenarioName": "scenario-4-organizations-235526-teams",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-4-organizations-235526-teams-2",
+  "insertionIndex": 35
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44-3945b4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44-3945b4.json
deleted file mode 100644
index e0debd7265..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44-3945b4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3945b427-290f-4fa2-a720-79cb00ba290e",
-  "name": "organizations_235526_teams",
-  "request": {
-    "url": "/organizations/235526/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_235526_teams-3945b427-290f-4fa2-a720-79cb00ba290e.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4874",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"44c9656011c8da0be5bb1fe95ef18a44\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113733:145C11E:5D969090",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\", <https://api.github.com/organizations/235526/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "3945b427-290f-4fa2-a720-79cb00ba290e",
-  "persistent": true,
-  "scenarioName": "scenario-4-organizations-235526-teams",
-  "requiredScenarioState": "scenario-4-organizations-235526-teams-2",
-  "newScenarioState": "scenario-4-organizations-235526-teams-3",
-  "insertionIndex": 44
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44.json
new file mode 100644
index 0000000000..3c3eda9f0d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-44.json
@@ -0,0 +1,51 @@
+{
+  "id": "3945b427-290f-4fa2-a720-79cb00ba290e",
+  "name": "organizations_235526_teams",
+  "request": {
+    "url": "/organizations/235526/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_235526_teams-44.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4874",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"44c9656011c8da0be5bb1fe95ef18a44\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113733:145C11E:5D969090",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\", <https://api.github.com/organizations/235526/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "3945b427-290f-4fa2-a720-79cb00ba290e",
+  "persistent": true,
+  "scenarioName": "scenario-4-organizations-235526-teams",
+  "requiredScenarioState": "scenario-4-organizations-235526-teams-2",
+  "newScenarioState": "scenario-4-organizations-235526-teams-3",
+  "insertionIndex": 44
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47-bed317.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47-bed317.json
deleted file mode 100644
index dbe33b52e8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47-bed317.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "bed3177f-0cd7-4ebb-acff-67cc43fd2504",
-  "name": "organizations_235526_teams",
-  "request": {
-    "url": "/organizations/235526/teams?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_235526_teams-bed3177f-0cd7-4ebb-acff-67cc43fd2504.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4871",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"44c9656011c8da0be5bb1fe95ef18a44\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113764:145C156:5D969090",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\", <https://api.github.com/organizations/235526/teams?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "bed3177f-0cd7-4ebb-acff-67cc43fd2504",
-  "persistent": true,
-  "scenarioName": "scenario-4-organizations-235526-teams",
-  "requiredScenarioState": "scenario-4-organizations-235526-teams-3",
-  "insertionIndex": 47
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47.json
new file mode 100644
index 0000000000..abdcac7135
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/organizations_235526_teams-47.json
@@ -0,0 +1,50 @@
+{
+  "id": "bed3177f-0cd7-4ebb-acff-67cc43fd2504",
+  "name": "organizations_235526_teams",
+  "request": {
+    "url": "/organizations/235526/teams?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_235526_teams-47.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4871",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"44c9656011c8da0be5bb1fe95ef18a44\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113764:145C156:5D969090",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=1>; rel=\"prev\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\", <https://api.github.com/organizations/235526/teams?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "bed3177f-0cd7-4ebb-acff-67cc43fd2504",
+  "persistent": true,
+  "scenarioName": "scenario-4-organizations-235526-teams",
+  "requiredScenarioState": "scenario-4-organizations-235526-teams-3",
+  "insertionIndex": 47
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67-62298d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67-62298d.json
deleted file mode 100644
index 7279e114d4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67-62298d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "62298d74-fe3c-459d-9f70-450e80247969",
-  "name": "orgs_beautify-web",
-  "request": {
-    "url": "/orgs/beautify-web",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_beautify-web-62298d74-fe3c-459d-9f70-450e80247969.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4851",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dd4a06709596dc92c3149f801079e32f\"",
-      "Last-Modified": "Fri, 20 Sep 2019 14:31:51 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:111388D:145C2C6:5D969093"
-    }
-  },
-  "uuid": "62298d74-fe3c-459d-9f70-450e80247969",
-  "persistent": true,
-  "insertionIndex": 67
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67.json
new file mode 100644
index 0000000000..956c3e7f34
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web-67.json
@@ -0,0 +1,48 @@
+{
+  "id": "62298d74-fe3c-459d-9f70-450e80247969",
+  "name": "orgs_beautify-web",
+  "request": {
+    "url": "/orgs/beautify-web",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_beautify-web-67.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4851",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dd4a06709596dc92c3149f801079e32f\"",
+      "Last-Modified": "Fri, 20 Sep 2019 14:31:51 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:111388D:145C2C6:5D969093"
+    }
+  },
+  "uuid": "62298d74-fe3c-459d-9f70-450e80247969",
+  "persistent": true,
+  "insertionIndex": 67
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68-586844.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68-586844.json
deleted file mode 100644
index 1334192215..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68-586844.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "58684478-ae6b-43c2-b30c-af37aeb81621",
-  "name": "orgs_beautify-web_teams",
-  "request": {
-    "url": "/orgs/beautify-web/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_beautify-web_teams-58684478-ae6b-43c2-b30c-af37aeb81621.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4850",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cae953250c5fce5fb3d69d903faf89ce\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113899:145C2D6:5D969093"
-    }
-  },
-  "uuid": "58684478-ae6b-43c2-b30c-af37aeb81621",
-  "persistent": true,
-  "insertionIndex": 68
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68.json
new file mode 100644
index 0000000000..a3230f33bf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_beautify-web_teams-68.json
@@ -0,0 +1,47 @@
+{
+  "id": "58684478-ae6b-43c2-b30c-af37aeb81621",
+  "name": "orgs_beautify-web_teams",
+  "request": {
+    "url": "/orgs/beautify-web/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_beautify-web_teams-68.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4850",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cae953250c5fce5fb3d69d903faf89ce\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113899:145C2D6:5D969093"
+    }
+  },
+  "uuid": "58684478-ae6b-43c2-b30c-af37aeb81621",
+  "persistent": true,
+  "insertionIndex": 68
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33-ce8716.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33-ce8716.json
deleted file mode 100644
index 0dd657099e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33-ce8716.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ce8716a4-ec25-4626-9a3a-205e5558bd39",
-  "name": "orgs_cloudbees",
-  "request": {
-    "url": "/orgs/cloudbees",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees-ce8716a4-ec25-4626-9a3a-205e5558bd39.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4885",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"87dc367baf67ce7b49c7e6bf733e9e47\"",
-      "Last-Modified": "Thu, 26 Jul 2018 22:36:42 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113690:145C054:5D96908E"
-    }
-  },
-  "uuid": "ce8716a4-ec25-4626-9a3a-205e5558bd39",
-  "persistent": true,
-  "insertionIndex": 33
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33.json
new file mode 100644
index 0000000000..421b5769b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees-33.json
@@ -0,0 +1,48 @@
+{
+  "id": "ce8716a4-ec25-4626-9a3a-205e5558bd39",
+  "name": "orgs_cloudbees",
+  "request": {
+    "url": "/orgs/cloudbees",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees-33.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4885",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"87dc367baf67ce7b49c7e6bf733e9e47\"",
+      "Last-Modified": "Thu, 26 Jul 2018 22:36:42 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113690:145C054:5D96908E"
+    }
+  },
+  "uuid": "ce8716a4-ec25-4626-9a3a-205e5558bd39",
+  "persistent": true,
+  "insertionIndex": 33
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34-57f5eb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34-57f5eb.json
deleted file mode 100644
index 7ffe656fa3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34-57f5eb.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "57f5eb24-dd30-4d2c-9e6a-90dcd973e21f",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-57f5eb24-dd30-4d2c-9e6a-90dcd973e21f.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4884",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11136A4:145C06D:5D96908E",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "57f5eb24-dd30-4d2c-9e6a-90dcd973e21f",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-3-orgs-cloudbees-teams-2",
-  "insertionIndex": 34
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34.json
new file mode 100644
index 0000000000..359b1ae600
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-34.json
@@ -0,0 +1,51 @@
+{
+  "id": "57f5eb24-dd30-4d2c-9e6a-90dcd973e21f",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-34.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4884",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11136A4:145C06D:5D96908E",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "57f5eb24-dd30-4d2c-9e6a-90dcd973e21f",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-3-orgs-cloudbees-teams-2",
+  "insertionIndex": 34
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37-632605.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37-632605.json
deleted file mode 100644
index f2048d801f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37-632605.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "632605dd-2411-4c5d-8fd0-7d57f23cb0a5",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-632605dd-2411-4c5d-8fd0-7d57f23cb0a5.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4881",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11136D0:145C09C:5D96908F",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "632605dd-2411-4c5d-8fd0-7d57f23cb0a5",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-2",
-  "newScenarioState": "scenario-3-orgs-cloudbees-teams-3",
-  "insertionIndex": 37
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37.json
new file mode 100644
index 0000000000..891a7a2b39
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-37.json
@@ -0,0 +1,51 @@
+{
+  "id": "632605dd-2411-4c5d-8fd0-7d57f23cb0a5",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-37.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4881",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11136D0:145C09C:5D96908F",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "632605dd-2411-4c5d-8fd0-7d57f23cb0a5",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-2",
+  "newScenarioState": "scenario-3-orgs-cloudbees-teams-3",
+  "insertionIndex": 37
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39-fbf640.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39-fbf640.json
deleted file mode 100644
index bccec1c599..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39-fbf640.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "fbf640ca-c41a-4e82-9c5a-75ba2175bc0c",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-fbf640ca-c41a-4e82-9c5a-75ba2175bc0c.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4879",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11136F4:145C0CB:5D96908F",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "fbf640ca-c41a-4e82-9c5a-75ba2175bc0c",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-3",
-  "newScenarioState": "scenario-3-orgs-cloudbees-teams-4",
-  "insertionIndex": 39
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39.json
new file mode 100644
index 0000000000..98f2f2af3d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-39.json
@@ -0,0 +1,51 @@
+{
+  "id": "fbf640ca-c41a-4e82-9c5a-75ba2175bc0c",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-39.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4879",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11136F4:145C0CB:5D96908F",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "fbf640ca-c41a-4e82-9c5a-75ba2175bc0c",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-3",
+  "newScenarioState": "scenario-3-orgs-cloudbees-teams-4",
+  "insertionIndex": 39
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41-c3bba3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41-c3bba3.json
deleted file mode 100644
index 814e01f601..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41-c3bba3.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c3bba3a6-1c09-4663-bbd5-61f4184faffa",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-c3bba3a6-1c09-4663-bbd5-61f4184faffa.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4877",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:111370E:145C0ED:5D96908F",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "c3bba3a6-1c09-4663-bbd5-61f4184faffa",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-4",
-  "newScenarioState": "scenario-3-orgs-cloudbees-teams-5",
-  "insertionIndex": 41
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41.json
new file mode 100644
index 0000000000..919ff11e94
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-41.json
@@ -0,0 +1,51 @@
+{
+  "id": "c3bba3a6-1c09-4663-bbd5-61f4184faffa",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-41.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4877",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:111370E:145C0ED:5D96908F",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "c3bba3a6-1c09-4663-bbd5-61f4184faffa",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-4",
+  "newScenarioState": "scenario-3-orgs-cloudbees-teams-5",
+  "insertionIndex": 41
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43-1d3fc4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43-1d3fc4.json
deleted file mode 100644
index 7fb394bc6f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43-1d3fc4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1d3fc4da-c320-4621-bf6c-4fa95aeb487e",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-1d3fc4da-c320-4621-bf6c-4fa95aeb487e.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4875",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113722:145C107:5D96908F",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "1d3fc4da-c320-4621-bf6c-4fa95aeb487e",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-5",
-  "newScenarioState": "scenario-3-orgs-cloudbees-teams-6",
-  "insertionIndex": 43
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43.json
new file mode 100644
index 0000000000..2e195b4eb8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-43.json
@@ -0,0 +1,51 @@
+{
+  "id": "1d3fc4da-c320-4621-bf6c-4fa95aeb487e",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-43.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4875",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113722:145C107:5D96908F",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "1d3fc4da-c320-4621-bf6c-4fa95aeb487e",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-5",
+  "newScenarioState": "scenario-3-orgs-cloudbees-teams-6",
+  "insertionIndex": 43
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46-4d6d15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46-4d6d15.json
deleted file mode 100644
index af9ded76ef..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46-4d6d15.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4d6d15f8-8345-4ce7-af12-dcd50335d2c0",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-4d6d15f8-8345-4ce7-af12-dcd50335d2c0.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4872",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113752:145C13F:5D969090",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "4d6d15f8-8345-4ce7-af12-dcd50335d2c0",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-6",
-  "newScenarioState": "scenario-3-orgs-cloudbees-teams-7",
-  "insertionIndex": 46
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46.json
new file mode 100644
index 0000000000..a49618d71e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-46.json
@@ -0,0 +1,51 @@
+{
+  "id": "4d6d15f8-8345-4ce7-af12-dcd50335d2c0",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-46.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4872",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113752:145C13F:5D969090",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "4d6d15f8-8345-4ce7-af12-dcd50335d2c0",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-6",
+  "newScenarioState": "scenario-3-orgs-cloudbees-teams-7",
+  "insertionIndex": 46
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49-35c476.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49-35c476.json
deleted file mode 100644
index 53b1f8adff..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49-35c476.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "35c47636-9b2c-4e43-866a-62d34ddf04fb",
-  "name": "orgs_cloudbees_teams",
-  "request": {
-    "url": "/orgs/cloudbees/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_cloudbees_teams-35c47636-9b2c-4e43-866a-62d34ddf04fb.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4869",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113780:145C17A:5D969090",
-      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "35c47636-9b2c-4e43-866a-62d34ddf04fb",
-  "persistent": true,
-  "scenarioName": "scenario-3-orgs-cloudbees-teams",
-  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-7",
-  "insertionIndex": 49
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49.json
new file mode 100644
index 0000000000..93bcc85b4f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_cloudbees_teams-49.json
@@ -0,0 +1,50 @@
+{
+  "id": "35c47636-9b2c-4e43-866a-62d34ddf04fb",
+  "name": "orgs_cloudbees_teams",
+  "request": {
+    "url": "/orgs/cloudbees/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_cloudbees_teams-49.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4869",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1a9b7148b69e264c0591450e5f2a207\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113780:145C17A:5D969090",
+      "Link": "<https://api.github.com/organizations/235526/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/235526/teams?page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "35c47636-9b2c-4e43-866a-62d34ddf04fb",
+  "persistent": true,
+  "scenarioName": "scenario-3-orgs-cloudbees-teams",
+  "requiredScenarioState": "scenario-3-orgs-cloudbees-teams-7",
+  "insertionIndex": 49
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51-a52998.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51-a52998.json
deleted file mode 100644
index 5402656cf1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51-a52998.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a529986c-70bb-4329-9816-ec1f75673e9c",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-a529986c-70bb-4329-9816-ec1f75673e9c.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4867",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:111379D:145C1A3:5D969091"
-    }
-  },
-  "uuid": "a529986c-70bb-4329-9816-ec1f75673e9c",
-  "persistent": true,
-  "insertionIndex": 51
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51.json
new file mode 100644
index 0000000000..85fb1c1fc5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org-51.json
@@ -0,0 +1,48 @@
+{
+  "id": "a529986c-70bb-4329-9816-ec1f75673e9c",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-51.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4867",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:111379D:145C1A3:5D969091"
+    }
+  },
+  "uuid": "a529986c-70bb-4329-9816-ec1f75673e9c",
+  "persistent": true,
+  "insertionIndex": 51
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52-c4dada.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52-c4dada.json
deleted file mode 100644
index eed89fccfc..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52-c4dada.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "c4dada63-33ed-4ac0-856c-e35d466ac7f8",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-c4dada63-33ed-4ac0-856c-e35d466ac7f8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4866",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d73a82173554b9946f9c6dc2ec80456a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11137AF:145C1B9:5D969091"
-    }
-  },
-  "uuid": "c4dada63-33ed-4ac0-856c-e35d466ac7f8",
-  "persistent": true,
-  "scenarioName": "scenario-5-orgs-github-api-test-org-teams",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-5-orgs-github-api-test-org-teams-2",
-  "insertionIndex": 52
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52.json
new file mode 100644
index 0000000000..64887678e8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-52.json
@@ -0,0 +1,50 @@
+{
+  "id": "c4dada63-33ed-4ac0-856c-e35d466ac7f8",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-52.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4866",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d73a82173554b9946f9c6dc2ec80456a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11137AF:145C1B9:5D969091"
+    }
+  },
+  "uuid": "c4dada63-33ed-4ac0-856c-e35d466ac7f8",
+  "persistent": true,
+  "scenarioName": "scenario-5-orgs-github-api-test-org-teams",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-5-orgs-github-api-test-org-teams-2",
+  "insertionIndex": 52
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54-4eeff3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54-4eeff3.json
deleted file mode 100644
index 183fcd1534..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54-4eeff3.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "4eeff351-c1bd-449c-bf07-0cd3d013dc9b",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-4eeff351-c1bd-449c-bf07-0cd3d013dc9b.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4864",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d73a82173554b9946f9c6dc2ec80456a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11137C9:145C1DA:5D969091"
-    }
-  },
-  "uuid": "4eeff351-c1bd-449c-bf07-0cd3d013dc9b",
-  "persistent": true,
-  "scenarioName": "scenario-5-orgs-github-api-test-org-teams",
-  "requiredScenarioState": "scenario-5-orgs-github-api-test-org-teams-2",
-  "insertionIndex": 54
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54.json
new file mode 100644
index 0000000000..93bbf88fb0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_github-api-test-org_teams-54.json
@@ -0,0 +1,49 @@
+{
+  "id": "4eeff351-c1bd-449c-bf07-0cd3d013dc9b",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-54.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4864",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d73a82173554b9946f9c6dc2ec80456a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11137C9:145C1DA:5D969091"
+    }
+  },
+  "uuid": "4eeff351-c1bd-449c-bf07-0cd3d013dc9b",
+  "persistent": true,
+  "scenarioName": "scenario-5-orgs-github-api-test-org-teams",
+  "requiredScenarioState": "scenario-5-orgs-github-api-test-org-teams-2",
+  "insertionIndex": 54
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30-e0b11b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30-e0b11b.json
deleted file mode 100644
index c32c969c36..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30-e0b11b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e0b11bd2-736d-44c8-aa64-f5848d4691f6",
-  "name": "orgs_jenkins-inc",
-  "request": {
-    "url": "/orgs/jenkins-inc",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-inc-e0b11bd2-736d-44c8-aa64-f5848d4691f6.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4888",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f514ef373296505e38cb2f238f243f40\"",
-      "Last-Modified": "Mon, 29 Feb 2016 18:11:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113667:145C025:5D96908E"
-    }
-  },
-  "uuid": "e0b11bd2-736d-44c8-aa64-f5848d4691f6",
-  "persistent": true,
-  "insertionIndex": 30
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30.json
new file mode 100644
index 0000000000..3585474b3e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc-30.json
@@ -0,0 +1,48 @@
+{
+  "id": "e0b11bd2-736d-44c8-aa64-f5848d4691f6",
+  "name": "orgs_jenkins-inc",
+  "request": {
+    "url": "/orgs/jenkins-inc",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-inc-30.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4888",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f514ef373296505e38cb2f238f243f40\"",
+      "Last-Modified": "Mon, 29 Feb 2016 18:11:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113667:145C025:5D96908E"
+    }
+  },
+  "uuid": "e0b11bd2-736d-44c8-aa64-f5848d4691f6",
+  "persistent": true,
+  "insertionIndex": 30
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31-383d61.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31-383d61.json
deleted file mode 100644
index b559e995fa..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31-383d61.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "383d61fc-1c69-4ae1-919a-b98b678b47cd",
-  "name": "orgs_jenkins-inc_teams",
-  "request": {
-    "url": "/orgs/jenkins-inc/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-inc_teams-383d61fc-1c69-4ae1-919a-b98b678b47cd.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4887",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b99e79ef4aad1bb4dcbadfc02fb41347\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113677:145C036:5D96908E"
-    }
-  },
-  "uuid": "383d61fc-1c69-4ae1-919a-b98b678b47cd",
-  "persistent": true,
-  "insertionIndex": 31
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31.json
new file mode 100644
index 0000000000..eee8110b16
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-inc_teams-31.json
@@ -0,0 +1,47 @@
+{
+  "id": "383d61fc-1c69-4ae1-919a-b98b678b47cd",
+  "name": "orgs_jenkins-inc_teams",
+  "request": {
+    "url": "/orgs/jenkins-inc/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-inc_teams-31.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4887",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b99e79ef4aad1bb4dcbadfc02fb41347\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113677:145C036:5D96908E"
+    }
+  },
+  "uuid": "383d61fc-1c69-4ae1-919a-b98b678b47cd",
+  "persistent": true,
+  "insertionIndex": 31
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56-b7c4f4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56-b7c4f4.json
deleted file mode 100644
index bf9ff0051f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56-b7c4f4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b7c4f477-4e3a-4505-874e-dd816080c7f4",
-  "name": "orgs_jenkins-infra",
-  "request": {
-    "url": "/orgs/jenkins-infra",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra-b7c4f477-4e3a-4505-874e-dd816080c7f4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4862",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e48a304b3abd03ef2d3c449670e6e818\"",
-      "Last-Modified": "Tue, 07 Aug 2018 02:50:50 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11137E5:145C1F5:5D969091"
-    }
-  },
-  "uuid": "b7c4f477-4e3a-4505-874e-dd816080c7f4",
-  "persistent": true,
-  "insertionIndex": 56
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56.json
new file mode 100644
index 0000000000..7ed6f10fbd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra-56.json
@@ -0,0 +1,48 @@
+{
+  "id": "b7c4f477-4e3a-4505-874e-dd816080c7f4",
+  "name": "orgs_jenkins-infra",
+  "request": {
+    "url": "/orgs/jenkins-infra",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra-56.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4862",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e48a304b3abd03ef2d3c449670e6e818\"",
+      "Last-Modified": "Tue, 07 Aug 2018 02:50:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11137E5:145C1F5:5D969091"
+    }
+  },
+  "uuid": "b7c4f477-4e3a-4505-874e-dd816080c7f4",
+  "persistent": true,
+  "insertionIndex": 56
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57-196db4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57-196db4.json
deleted file mode 100644
index 3b16736c32..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57-196db4.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "196db464-b833-490c-97e4-79f79fe29f07",
-  "name": "orgs_jenkins-infra_teams",
-  "request": {
-    "url": "/orgs/jenkins-infra/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra_teams-196db464-b833-490c-97e4-79f79fe29f07.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4861",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11137F3:145C204:5D969091"
-    }
-  },
-  "uuid": "196db464-b833-490c-97e4-79f79fe29f07",
-  "persistent": true,
-  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-2",
-  "insertionIndex": 57
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57.json
new file mode 100644
index 0000000000..7c066fb7a4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-57.json
@@ -0,0 +1,50 @@
+{
+  "id": "196db464-b833-490c-97e4-79f79fe29f07",
+  "name": "orgs_jenkins-infra_teams",
+  "request": {
+    "url": "/orgs/jenkins-infra/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra_teams-57.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4861",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11137F3:145C204:5D969091"
+    }
+  },
+  "uuid": "196db464-b833-490c-97e4-79f79fe29f07",
+  "persistent": true,
+  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-2",
+  "insertionIndex": 57
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59-b6bb78.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59-b6bb78.json
deleted file mode 100644
index 853342488e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59-b6bb78.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74",
-  "name": "orgs_jenkins-infra_teams",
-  "request": {
-    "url": "/orgs/jenkins-infra/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra_teams-b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4859",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113828:145C237:5D969092"
-    }
-  },
-  "uuid": "b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74",
-  "persistent": true,
-  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
-  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-2",
-  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-3",
-  "insertionIndex": 59
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59.json
new file mode 100644
index 0000000000..add5644760
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-59.json
@@ -0,0 +1,50 @@
+{
+  "id": "b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74",
+  "name": "orgs_jenkins-infra_teams",
+  "request": {
+    "url": "/orgs/jenkins-infra/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra_teams-59.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4859",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113828:145C237:5D969092"
+    }
+  },
+  "uuid": "b6bb7856-85f0-4bcb-9c9c-5ab9c1be8e74",
+  "persistent": true,
+  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
+  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-2",
+  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-3",
+  "insertionIndex": 59
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61-a7f22b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61-a7f22b.json
deleted file mode 100644
index c2f73c11d6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61-a7f22b.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a7f22b01-940f-40f5-9496-f3e0bd87dbf8",
-  "name": "orgs_jenkins-infra_teams",
-  "request": {
-    "url": "/orgs/jenkins-infra/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra_teams-a7f22b01-940f-40f5-9496-f3e0bd87dbf8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4857",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113845:145C269:5D969092"
-    }
-  },
-  "uuid": "a7f22b01-940f-40f5-9496-f3e0bd87dbf8",
-  "persistent": true,
-  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
-  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-3",
-  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-4",
-  "insertionIndex": 61
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61.json
new file mode 100644
index 0000000000..f796f4e030
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-61.json
@@ -0,0 +1,50 @@
+{
+  "id": "a7f22b01-940f-40f5-9496-f3e0bd87dbf8",
+  "name": "orgs_jenkins-infra_teams",
+  "request": {
+    "url": "/orgs/jenkins-infra/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra_teams-61.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4857",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113845:145C269:5D969092"
+    }
+  },
+  "uuid": "a7f22b01-940f-40f5-9496-f3e0bd87dbf8",
+  "persistent": true,
+  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
+  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-3",
+  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-4",
+  "insertionIndex": 61
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63-b5053d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63-b5053d.json
deleted file mode 100644
index b04566df35..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63-b5053d.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "b5053ddf-d2f8-4ea4-a246-1118f02f3ac7",
-  "name": "orgs_jenkins-infra_teams",
-  "request": {
-    "url": "/orgs/jenkins-infra/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra_teams-b5053ddf-d2f8-4ea4-a246-1118f02f3ac7.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4855",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:111385C:145C285:5D969092"
-    }
-  },
-  "uuid": "b5053ddf-d2f8-4ea4-a246-1118f02f3ac7",
-  "persistent": true,
-  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
-  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-4",
-  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-5",
-  "insertionIndex": 63
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63.json
new file mode 100644
index 0000000000..fb517fa441
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-63.json
@@ -0,0 +1,50 @@
+{
+  "id": "b5053ddf-d2f8-4ea4-a246-1118f02f3ac7",
+  "name": "orgs_jenkins-infra_teams",
+  "request": {
+    "url": "/orgs/jenkins-infra/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra_teams-63.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4855",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:111385C:145C285:5D969092"
+    }
+  },
+  "uuid": "b5053ddf-d2f8-4ea4-a246-1118f02f3ac7",
+  "persistent": true,
+  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
+  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-4",
+  "newScenarioState": "scenario-6-orgs-jenkins-infra-teams-5",
+  "insertionIndex": 63
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65-f8bd81.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65-f8bd81.json
deleted file mode 100644
index 46c4a27eb9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65-f8bd81.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "f8bd811b-e074-4e0a-b2f3-dc3f749b5c07",
-  "name": "orgs_jenkins-infra_teams",
-  "request": {
-    "url": "/orgs/jenkins-infra/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkins-infra_teams-f8bd811b-e074-4e0a-b2f3-dc3f749b5c07.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4853",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113870:145C2A0:5D969093"
-    }
-  },
-  "uuid": "f8bd811b-e074-4e0a-b2f3-dc3f749b5c07",
-  "persistent": true,
-  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
-  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-5",
-  "insertionIndex": 65
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65.json
new file mode 100644
index 0000000000..d573327eb3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkins-infra_teams-65.json
@@ -0,0 +1,49 @@
+{
+  "id": "f8bd811b-e074-4e0a-b2f3-dc3f749b5c07",
+  "name": "orgs_jenkins-infra_teams",
+  "request": {
+    "url": "/orgs/jenkins-infra/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkins-infra_teams-65.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4853",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d1b2884c6058f8b6c4e0fdd1271df48a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113870:145C2A0:5D969093"
+    }
+  },
+  "uuid": "f8bd811b-e074-4e0a-b2f3-dc3f749b5c07",
+  "persistent": true,
+  "scenarioName": "scenario-6-orgs-jenkins-infra-teams",
+  "requiredScenarioState": "scenario-6-orgs-jenkins-infra-teams-5",
+  "insertionIndex": 65
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3-eac3f0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3-eac3f0.json
deleted file mode 100644
index b5c575cc86..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3-eac3f0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "eac3f0df-0404-4c43-9864-bf3d6f249294",
-  "name": "orgs_jenkinsci",
-  "request": {
-    "url": "/orgs/jenkinsci",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci-eac3f0df-0404-4c43-9864-bf3d6f249294.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4915",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e3ef1784e60d0e3be8d29d643279e4ad\"",
-      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11134B4:145BE13:5D969089"
-    }
-  },
-  "uuid": "eac3f0df-0404-4c43-9864-bf3d6f249294",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3.json
new file mode 100644
index 0000000000..d3a06df7c6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "eac3f0df-0404-4c43-9864-bf3d6f249294",
+  "name": "orgs_jenkinsci",
+  "request": {
+    "url": "/orgs/jenkinsci",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4915",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e3ef1784e60d0e3be8d29d643279e4ad\"",
+      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11134B4:145BE13:5D969089"
+    }
+  },
+  "uuid": "eac3f0df-0404-4c43-9864-bf3d6f249294",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10-bedcae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10-bedcae.json
deleted file mode 100644
index 69be4ee778..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10-bedcae.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "bedcaedb-24fc-4a6e-a099-b64fd26d4e97",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-bedcaedb-24fc-4a6e-a099-b64fd26d4e97.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:111351E:145BE99:5D96908B",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "bedcaedb-24fc-4a6e-a099-b64fd26d4e97",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-4",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-5",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10.json
new file mode 100644
index 0000000000..b821137964
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-10.json
@@ -0,0 +1,51 @@
+{
+  "id": "bedcaedb-24fc-4a6e-a099-b64fd26d4e97",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-10.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:111351E:145BE99:5D96908B",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "bedcaedb-24fc-4a6e-a099-b64fd26d4e97",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-4",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-5",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13-acf98b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13-acf98b.json
deleted file mode 100644
index a9796cb9b5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13-acf98b.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "acf98bee-b6c1-4f33-b62e-f86b8d5445fe",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-acf98bee-b6c1-4f33-b62e-f86b8d5445fe.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4905",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113554:145BED5:5D96908B",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "acf98bee-b6c1-4f33-b62e-f86b8d5445fe",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-5",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-6",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13.json
new file mode 100644
index 0000000000..0b66f600fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-13.json
@@ -0,0 +1,51 @@
+{
+  "id": "acf98bee-b6c1-4f33-b62e-f86b8d5445fe",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-13.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4905",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113554:145BED5:5D96908B",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "acf98bee-b6c1-4f33-b62e-f86b8d5445fe",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-5",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-6",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15-0aaf05.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15-0aaf05.json
deleted file mode 100644
index 14e425a5ff..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15-0aaf05.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "0aaf0590-1a5b-4323-8dbc-8fc63b3c5775",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-0aaf0590-1a5b-4323-8dbc-8fc63b3c5775.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4903",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113572:145BEF8:5D96908B",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "0aaf0590-1a5b-4323-8dbc-8fc63b3c5775",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-6",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-7",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15.json
new file mode 100644
index 0000000000..bac88fe76a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-15.json
@@ -0,0 +1,51 @@
+{
+  "id": "0aaf0590-1a5b-4323-8dbc-8fc63b3c5775",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-15.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4903",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113572:145BEF8:5D96908B",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "0aaf0590-1a5b-4323-8dbc-8fc63b3c5775",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-6",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-7",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17-90bfe4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17-90bfe4.json
deleted file mode 100644
index 5c5122db08..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17-90bfe4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4901",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11135B4:145BF49:5D96908C",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-7",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-8",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17.json
new file mode 100644
index 0000000000..3347095bbc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-17.json
@@ -0,0 +1,51 @@
+{
+  "id": "90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-17.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4901",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11135B4:145BF49:5D96908C",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "90bfe4fd-6ad3-429d-b35d-2cac4f0c83f4",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-7",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-8",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19-4922cd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19-4922cd.json
deleted file mode 100644
index 39b9c8e088..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19-4922cd.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4922cdbe-d115-4bb4-94be-4f75c07fc45d",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-4922cdbe-d115-4bb4-94be-4f75c07fc45d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11135CC:145BF66:5D96908C",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "4922cdbe-d115-4bb4-94be-4f75c07fc45d",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-8",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-9",
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19.json
new file mode 100644
index 0000000000..a847d42828
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-19.json
@@ -0,0 +1,51 @@
+{
+  "id": "4922cdbe-d115-4bb4-94be-4f75c07fc45d",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-19.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4899",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11135CC:145BF66:5D96908C",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "4922cdbe-d115-4bb4-94be-4f75c07fc45d",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-8",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-9",
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22-4b9e60.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22-4b9e60.json
deleted file mode 100644
index af23520587..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22-4b9e60.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4b9e6062-54b4-41b5-ba0d-9c891b471122",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-4b9e6062-54b4-41b5-ba0d-9c891b471122.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11135F5:145BF9A:5D96908C",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "4b9e6062-54b4-41b5-ba0d-9c891b471122",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-9",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-10",
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22.json
new file mode 100644
index 0000000000..f2802f5eae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-22.json
@@ -0,0 +1,51 @@
+{
+  "id": "4b9e6062-54b4-41b5-ba0d-9c891b471122",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-22.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11135F5:145BF9A:5D96908C",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "4b9e6062-54b4-41b5-ba0d-9c891b471122",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-9",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-10",
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25-51a481.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25-51a481.json
deleted file mode 100644
index f9a9c87074..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25-51a481.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "51a481cc-1f18-4eae-a2c7-3835859468b4",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-51a481cc-1f18-4eae-a2c7-3835859468b4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4893",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113624:145BFD2:5D96908D",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "51a481cc-1f18-4eae-a2c7-3835859468b4",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-10",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-11",
-  "insertionIndex": 25
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25.json
new file mode 100644
index 0000000000..233485da6f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-25.json
@@ -0,0 +1,51 @@
+{
+  "id": "51a481cc-1f18-4eae-a2c7-3835859468b4",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-25.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4893",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113624:145BFD2:5D96908D",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "51a481cc-1f18-4eae-a2c7-3835859468b4",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-10",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-11",
+  "insertionIndex": 25
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28-a9e651.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28-a9e651.json
deleted file mode 100644
index 165d1fd7d6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28-a9e651.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4890",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113656:145C00C:5D96908D",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-11",
-  "insertionIndex": 28
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28.json
new file mode 100644
index 0000000000..f3bac8d801
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-28.json
@@ -0,0 +1,50 @@
+{
+  "id": "a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-28.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4890",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113656:145C00C:5D96908D",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "a9e65166-cb20-4ab8-ac9d-3ef6b07ecf08",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-11",
+  "insertionIndex": 28
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4-421fa9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4-421fa9.json
deleted file mode 100644
index 347b2e69f0..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4-421fa9.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "421fa98d-71d5-4c1c-a6cb-4f7f301668c7",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-421fa98d-71d5-4c1c-a6cb-4f7f301668c7.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4914",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11134C3:145BE2C:5D96908A",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "421fa98d-71d5-4c1c-a6cb-4f7f301668c7",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4.json
new file mode 100644
index 0000000000..4d58360fc4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-4.json
@@ -0,0 +1,51 @@
+{
+  "id": "421fa98d-71d5-4c1c-a6cb-4f7f301668c7",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4914",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11134C3:145BE2C:5D96908A",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "421fa98d-71d5-4c1c-a6cb-4f7f301668c7",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6-7e7d35.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6-7e7d35.json
deleted file mode 100644
index bfd47e225e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6-7e7d35.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "7e7d35f3-0e07-4cbb-a814-e363eca72d3d",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-7e7d35f3-0e07-4cbb-a814-e363eca72d3d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4912",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:11134E3:145BE50:5D96908A",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "7e7d35f3-0e07-4cbb-a814-e363eca72d3d",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-2",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-3",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6.json
new file mode 100644
index 0000000000..f79c4043c4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "7e7d35f3-0e07-4cbb-a814-e363eca72d3d",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-6.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4912",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:11134E3:145BE50:5D96908A",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "7e7d35f3-0e07-4cbb-a814-e363eca72d3d",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-2",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-3",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8-2832b4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8-2832b4.json
deleted file mode 100644
index 2bfcb5b91d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8-2832b4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2832b4d6-9274-4137-9421-4855660803ec",
-  "name": "orgs_jenkinsci_teams",
-  "request": {
-    "url": "/orgs/jenkinsci/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_teams-2832b4d6-9274-4137-9421-4855660803ec.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4910",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113501:145BE77:5D96908A",
-      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
-    }
-  },
-  "uuid": "2832b4d6-9274-4137-9421-4855660803ec",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
-  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-3",
-  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-4",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8.json
new file mode 100644
index 0000000000..8674002cfa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/orgs_jenkinsci_teams-8.json
@@ -0,0 +1,51 @@
+{
+  "id": "2832b4d6-9274-4137-9421-4855660803ec",
+  "name": "orgs_jenkinsci_teams",
+  "request": {
+    "url": "/orgs/jenkinsci/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_teams-8.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fea8e6d0291a5332cbfaed016d7bab\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113501:145BE77:5D96908A",
+      "Link": "<https://api.github.com/organizations/107424/teams?page=2>; rel=\"next\", <https://api.github.com/organizations/107424/teams?page=2>; rel=\"last\""
+    }
+  },
+  "uuid": "2832b4d6-9274-4137-9421-4855660803ec",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-jenkinsci-teams",
+  "requiredScenarioState": "scenario-1-orgs-jenkinsci-teams-3",
+  "newScenarioState": "scenario-1-orgs-jenkinsci-teams-4",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1450069_members_bitwiseman-50-4957ae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1450069_members_bitwiseman-50.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1450069_members_bitwiseman-50-4957ae.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1450069_members_bitwiseman-50.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1809126_members_bitwiseman-18-242ec4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1809126_members_bitwiseman-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1809126_members_bitwiseman-18-242ec4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1809126_members_bitwiseman-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1882929_members_bitwiseman-66-285fc3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1882929_members_bitwiseman-66.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1882929_members_bitwiseman-66-285fc3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1882929_members_bitwiseman-66.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1941826_members_bitwiseman-32-094e4d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1941826_members_bitwiseman-32.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1941826_members_bitwiseman-32-094e4d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1941826_members_bitwiseman-32.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1986920_members_bitwiseman-29-0dd3d9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1986920_members_bitwiseman-29.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1986920_members_bitwiseman-29-0dd3d9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_1986920_members_bitwiseman-29.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2070581_members_bitwiseman-42-e22d18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2070581_members_bitwiseman-42.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2070581_members_bitwiseman-42-e22d18.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2070581_members_bitwiseman-42.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2185547_members_bitwiseman-14-301ee9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2185547_members_bitwiseman-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2185547_members_bitwiseman-14-301ee9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2185547_members_bitwiseman-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2188150_members_bitwiseman-58-1a21b5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2188150_members_bitwiseman-58.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2188150_members_bitwiseman-58-1a21b5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2188150_members_bitwiseman-58.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2278154_members_bitwiseman-60-2a2981.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2278154_members_bitwiseman-60.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2278154_members_bitwiseman-60-2a2981.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2278154_members_bitwiseman-60.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2300722_members_bitwiseman-7-9bec56.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2300722_members_bitwiseman-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2300722_members_bitwiseman-7-9bec56.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2300722_members_bitwiseman-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384898_members_bitwiseman-40-95da17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384898_members_bitwiseman-40.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384898_members_bitwiseman-40-95da17.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384898_members_bitwiseman-40.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384906_members_bitwiseman-36-f56cc4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384906_members_bitwiseman-36.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384906_members_bitwiseman-36-f56cc4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2384906_members_bitwiseman-36.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2478842_members_bitwiseman-16-89727f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2478842_members_bitwiseman-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2478842_members_bitwiseman-16-89727f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2478842_members_bitwiseman-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2510135_members_bitwiseman-62-0a3910.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2510135_members_bitwiseman-62.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2510135_members_bitwiseman-62-0a3910.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2510135_members_bitwiseman-62.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2658933_members_bitwiseman-64-23b3d8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2658933_members_bitwiseman-64.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2658933_members_bitwiseman-64-23b3d8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2658933_members_bitwiseman-64.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832516_members_bitwiseman-27-01adc0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832516_members_bitwiseman-27.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832516_members_bitwiseman-27-01adc0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832516_members_bitwiseman-27.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832517_members_bitwiseman-21-bd3f96.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832517_members_bitwiseman-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832517_members_bitwiseman-21-bd3f96.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2832517_members_bitwiseman-21.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2915408_members_bitwiseman-45-b4fb18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2915408_members_bitwiseman-45.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2915408_members_bitwiseman-45-b4fb18.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2915408_members_bitwiseman-45.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2934265_members_bitwiseman-24-f07c2b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2934265_members_bitwiseman-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2934265_members_bitwiseman-24-f07c2b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_2934265_members_bitwiseman-24.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3023453_members_bitwiseman-12-2724fa.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3023453_members_bitwiseman-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3023453_members_bitwiseman-12-2724fa.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3023453_members_bitwiseman-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3136781_members_bitwiseman-48-ea7a1b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3136781_members_bitwiseman-48.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3136781_members_bitwiseman-48-ea7a1b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3136781_members_bitwiseman-48.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3451996_members_bitwiseman-55-0e9309.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3451996_members_bitwiseman-55.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3451996_members_bitwiseman-55-0e9309.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_3451996_members_bitwiseman-55.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_496711_members_bitwiseman-9-9e90f9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_496711_members_bitwiseman-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_496711_members_bitwiseman-9-9e90f9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_496711_members_bitwiseman-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_663296_members_bitwiseman-69-a75539.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_663296_members_bitwiseman-69.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_663296_members_bitwiseman-69-a75539.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_663296_members_bitwiseman-69.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_711073_members_bitwiseman-5-9723ac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_711073_members_bitwiseman-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_711073_members_bitwiseman-5-9723ac.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_711073_members_bitwiseman-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_820404_members_bitwiseman-53-be6df5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_820404_members_bitwiseman-53.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_820404_members_bitwiseman-53-be6df5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_820404_members_bitwiseman-53.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_879403_members_bitwiseman-38-189224.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_879403_members_bitwiseman-38.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_879403_members_bitwiseman-38-189224.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/teams_879403_members_bitwiseman-38.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1-9a7933.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1-9a7933.json
deleted file mode 100644
index eb562941be..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1-9a7933.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9a793342-57f8-4135-bd51-f0f96e57d45b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9a793342-57f8-4135-bd51-f0f96e57d45b.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4918",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:111343F:145BD84:5D969088"
-    }
-  },
-  "uuid": "9a793342-57f8-4135-bd51-f0f96e57d45b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1.json
new file mode 100644
index 0000000000..c6d2a2b848
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "9a793342-57f8-4135-bd51-f0f96e57d45b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4918",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:111343F:145BD84:5D969088"
+    }
+  },
+  "uuid": "9a793342-57f8-4135-bd51-f0f96e57d45b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2-d60daf.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2-d60daf.json
deleted file mode 100644
index 022b74ddd4..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2-d60daf.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "d60dafe1-79c4-4212-9544-739b7ee976b9",
-  "name": "user_teams",
-  "request": {
-    "url": "/user/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_teams-d60dafe1-79c4-4212-9544-739b7ee976b9.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:21:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4916",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"06e08fc04ec1c6d8e8b878742cc2c972\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D601:78E9:1113466:145BD95:5D969088"
-    }
-  },
-  "uuid": "d60dafe1-79c4-4212-9544-739b7ee976b9",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2.json
new file mode 100644
index 0000000000..041b1ed6d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testMyTeamsShouldIncludeMyself/mappings/user_teams-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "d60dafe1-79c4-4212-9544-739b7ee976b9",
+  "name": "user_teams",
+  "request": {
+    "url": "/user/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_teams-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:21:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4916",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"06e08fc04ec1c6d8e8b878742cc2c972\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D601:78E9:1113466:145BD95:5D969088"
+    }
+  },
+  "uuid": "d60dafe1-79c4-4212-9544-739b7ee976b9",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/orgs_github-api-test-org-1839874d-c184-4f20-942f-cc6d36806868.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/orgs_github-api-test-org-1839874d-c184-4f20-942f-cc6d36806868.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_github-api-test-org_rubywm-5b2f012d-aa23-4e59-849c-22b53a469c95.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_github-api-test-org_rubywm-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_github-api-test-org_rubywm-5b2f012d-aa23-4e59-849c-22b53a469c95.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_github-api-test-org_rubywm-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm-7f6b9ed5-222f-4c89-95a7-e45ef24d78a7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm-7f6b9ed5-222f-4c89-95a7-e45ef24d78a7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm_forks-044af303-143e-4469-be96-0a6e72032e5c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm_forks-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm_forks-044af303-143e-4469-be96-0a6e72032e5c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/repos_kohsuke_rubywm_forks-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/user-07a0042d-8162-4e85-9ed4-0ed31ebc9d63.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/user-07a0042d-8162-4e85-9ed4-0ed31ebc9d63.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3-183987.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3-183987.json
deleted file mode 100644
index 65b5c42a66..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3-183987.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1839874d-c184-4f20-942f-cc6d36806868",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-1839874d-c184-4f20-942f-cc6d36806868.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 22:05:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4913",
-      "X-RateLimit-Reset": "1574809159",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"21e3e165e412ba27b4bd9260ce4bcf70\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F26C:3C0B:7D58F8:93D8C8:5DDDA1B4"
-    }
-  },
-  "uuid": "1839874d-c184-4f20-942f-cc6d36806868",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..5d46d4a087
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "1839874d-c184-4f20-942f-cc6d36806868",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 22:05:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4913",
+      "X-RateLimit-Reset": "1574809159",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"21e3e165e412ba27b4bd9260ce4bcf70\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F26C:3C0B:7D58F8:93D8C8:5DDDA1B4"
+    }
+  },
+  "uuid": "1839874d-c184-4f20-942f-cc6d36806868",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5-5b2f01.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5-5b2f01.json
deleted file mode 100644
index 5928fc70a1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5-5b2f01.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5b2f012d-aa23-4e59-849c-22b53a469c95",
-  "name": "repos_github-api-test-org_rubywm",
-  "request": {
-    "url": "/repos/github-api-test-org/rubywm",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_rubywm-5b2f012d-aa23-4e59-849c-22b53a469c95.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 22:05:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4911",
-      "X-RateLimit-Reset": "1574809159",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4b00cafaee1fc02361314a36cba325da\"",
-      "Last-Modified": "Tue, 13 Aug 2019 14:29:25 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F26C:3C0B:7D598F:93D986:5DDDA1B6"
-    }
-  },
-  "uuid": "5b2f012d-aa23-4e59-849c-22b53a469c95",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5.json
new file mode 100644
index 0000000000..c1cdc48677
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_github-api-test-org_rubywm-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "5b2f012d-aa23-4e59-849c-22b53a469c95",
+  "name": "repos_github-api-test-org_rubywm",
+  "request": {
+    "url": "/repos/github-api-test-org/rubywm",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_rubywm-5.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 22:05:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4911",
+      "X-RateLimit-Reset": "1574809159",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4b00cafaee1fc02361314a36cba325da\"",
+      "Last-Modified": "Tue, 13 Aug 2019 14:29:25 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F26C:3C0B:7D598F:93D986:5DDDA1B6"
+    }
+  },
+  "uuid": "5b2f012d-aa23-4e59-849c-22b53a469c95",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2-7f6b9e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2-7f6b9e.json
deleted file mode 100644
index c78bb38c4a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2-7f6b9e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7f6b9ed5-222f-4c89-95a7-e45ef24d78a7",
-  "name": "repos_kohsuke_rubywm",
-  "request": {
-    "url": "/repos/kohsuke/rubywm",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kohsuke_rubywm-7f6b9ed5-222f-4c89-95a7-e45ef24d78a7.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 22:05:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4914",
-      "X-RateLimit-Reset": "1574809159",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"956ce297c162ac69efaf4ba1328b1cdb\"",
-      "Last-Modified": "Tue, 13 Aug 2019 14:29:25 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F26C:3C0B:7D58DD:93D7F2:5DDDA1B3"
-    }
-  },
-  "uuid": "7f6b9ed5-222f-4c89-95a7-e45ef24d78a7",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2.json
new file mode 100644
index 0000000000..1ea8852d7f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7f6b9ed5-222f-4c89-95a7-e45ef24d78a7",
+  "name": "repos_kohsuke_rubywm",
+  "request": {
+    "url": "/repos/kohsuke/rubywm",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kohsuke_rubywm-2.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 22:05:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4914",
+      "X-RateLimit-Reset": "1574809159",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"956ce297c162ac69efaf4ba1328b1cdb\"",
+      "Last-Modified": "Tue, 13 Aug 2019 14:29:25 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F26C:3C0B:7D58DD:93D7F2:5DDDA1B3"
+    }
+  },
+  "uuid": "7f6b9ed5-222f-4c89-95a7-e45ef24d78a7",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4-044af3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4-044af3.json
deleted file mode 100644
index f0e6d75fec..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4-044af3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "044af303-143e-4469-be96-0a6e72032e5c",
-  "name": "repos_kohsuke_rubywm_forks",
-  "request": {
-    "url": "/repos/kohsuke/rubywm/forks",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"organization\":\"github-api-test-org\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 202,
-    "bodyFileName": "repos_kohsuke_rubywm_forks-044af303-143e-4469-be96-0a6e72032e5c.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 22:05:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "202 Accepted",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4912",
-      "X-RateLimit-Reset": "1574809159",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F26C:3C0B:7D5915:93D8F7:5DDDA1B5"
-    }
-  },
-  "uuid": "044af303-143e-4469-be96-0a6e72032e5c",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4.json
new file mode 100644
index 0000000000..4ebf80d474
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/repos_kohsuke_rubywm_forks-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "044af303-143e-4469-be96-0a6e72032e5c",
+  "name": "repos_kohsuke_rubywm_forks",
+  "request": {
+    "url": "/repos/kohsuke/rubywm/forks",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"organization\":\"github-api-test-org\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 202,
+    "bodyFileName": "repos_kohsuke_rubywm_forks-4.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 22:05:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "202 Accepted",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4912",
+      "X-RateLimit-Reset": "1574809159",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F26C:3C0B:7D5915:93D8F7:5DDDA1B5"
+    }
+  },
+  "uuid": "044af303-143e-4469-be96-0a6e72032e5c",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1-07a004.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1-07a004.json
deleted file mode 100644
index 97ab110d73..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1-07a004.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "07a0042d-8162-4e85-9ed4-0ed31ebc9d63",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-07a0042d-8162-4e85-9ed4-0ed31ebc9d63.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 22:05:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4917",
-      "X-RateLimit-Reset": "1574809159",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"072b29f799172fd1523e04ec9f30fc24\"",
-      "Last-Modified": "Tue, 26 Nov 2019 22:02:50 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F26C:3C0B:7D5829:93D7D9:5DDDA1B3"
-    }
-  },
-  "uuid": "07a0042d-8162-4e85-9ed4-0ed31ebc9d63",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1.json
new file mode 100644
index 0000000000..20499ff39d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgFork/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "07a0042d-8162-4e85-9ed4-0ed31ebc9d63",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 22:05:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4917",
+      "X-RateLimit-Reset": "1574809159",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"072b29f799172fd1523e04ec9f30fc24\"",
+      "Last-Modified": "Tue, 26 Nov 2019 22:02:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F26C:3C0B:7D5829:93D7D9:5DDDA1B3"
+    }
+  },
+  "uuid": "07a0042d-8162-4e85-9ed4-0ed31ebc9d63",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-13ae5b85-5c4d-409b-94b4-f1d995106d24.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-13ae5b85-5c4d-409b-94b4-f1d995106d24.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-f533dd05-f467-4045-85f2-de7ef31e3c43.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-f533dd05-f467-4045-85f2-de7ef31e3c43.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-11.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-df03bd6c-ec4b-4911-8d43-58d2e2498eeb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-df03bd6c-ec4b-4911-8d43-58d2e2498eeb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-12.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-26bad52b-c62b-469b-885f-453d7b164aca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-26bad52b-c62b-469b-885f-453d7b164aca.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-13.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-8315bb73-ac7c-4890-83ee-8802c5eb57a6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-8315bb73-ac7c-4890-83ee-8802c5eb57a6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-14.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-ecf517ff-a34e-4190-9e4a-7ce48bccffae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-ecf517ff-a34e-4190-9e4a-7ce48bccffae.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-15.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-45dd04d4-645f-47f2-8412-52e08b3c2e50.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-45dd04d4-645f-47f2-8412-52e08b3c2e50.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-16.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-a73c5a75-e101-4321-aea4-c633929320e8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-a73c5a75-e101-4321-aea4-c633929320e8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-17.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-e66682bb-4a55-4cf9-9092-9c3aaf6dc915.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-e66682bb-4a55-4cf9-9092-9c3aaf6dc915.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-18.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-0e04a7f4-8a85-40ec-b90d-faf2822b648f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-0e04a7f4-8a85-40ec-b90d-faf2822b648f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-19.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-5cb3f8b7-17fc-4a5b-a8b3-99c07a604469.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-5cb3f8b7-17fc-4a5b-a8b3-99c07a604469.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-20.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-626ca8b6-883d-405d-a271-84b38deb0567.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-626ca8b6-883d-405d-a271-84b38deb0567.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-21.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-e0e43c36-cd33-4f86-b35d-165f964bf15e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-e0e43c36-cd33-4f86-b35d-165f964bf15e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-22.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-6f8a70ef-2168-4fad-8f28-d1ad0584525d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-6f8a70ef-2168-4fad-8f28-d1ad0584525d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-23.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-aec88ab4-fa24-43a9-93c9-82026978b8a7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-aec88ab4-fa24-43a9-93c9-82026978b8a7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-24.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d95d3c51-42d4-4138-86ba-95b07d066993.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-25.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d95d3c51-42d4-4138-86ba-95b07d066993.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-25.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-471f9be3-9f94-4788-bd01-316c9e5d03a4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-471f9be3-9f94-4788-bd01-316c9e5d03a4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d68a564a-7eca-47ca-af21-1bb492309cfc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d68a564a-7eca-47ca-af21-1bb492309cfc.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d4de5f04-8979-4506-b24d-f4e2ca3af58a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d4de5f04-8979-4506-b24d-f4e2ca3af58a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-db791f4d-4464-4055-80ae-83d017b7596d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-db791f4d-4464-4055-80ae-83d017b7596d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-49da2fa3-254f-41d7-8a0f-1ba36c19eae4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-49da2fa3-254f-41d7-8a0f-1ba36c19eae4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d4d7b222-62d1-4d88-bab9-ccf707f314e4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-d4d7b222-62d1-4d88-bab9-ccf707f314e4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/organizations_107424_repos-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci-72681a2c-9db9-44b8-a9cf-4084568695a0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci-72681a2c-9db9-44b8-a9cf-4084568695a0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci_repos-75d09b41-374d-4c15-b8fd-06b9e1e8402c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci_repos-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci_repos-75d09b41-374d-4c15-b8fd-06b9e1e8402c.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/orgs_jenkinsci_repos-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/user-50e8f530-8812-4f8d-afb0-8c5fc9294507.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/user-50e8f530-8812-4f8d-afb0-8c5fc9294507.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10-13ae5b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10-13ae5b.json
deleted file mode 100644
index 09fc3fc1f5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10-13ae5b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "13ae5b85-5c4d-409b-94b4-f1d995106d24",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=8",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-13ae5b85-5c4d-409b-94b4-f1d995106d24.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4370",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"83b91f4f1014e13312630c987b720ac6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE68CC:CCC6C7:5DB3A122",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=7>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=9>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "13ae5b85-5c4d-409b-94b4-f1d995106d24",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10.json
new file mode 100644
index 0000000000..f6b851cacc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "13ae5b85-5c4d-409b-94b4-f1d995106d24",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=8",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-10.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4370",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"83b91f4f1014e13312630c987b720ac6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE68CC:CCC6C7:5DB3A122",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=7>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=9>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "13ae5b85-5c4d-409b-94b4-f1d995106d24",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11-f533dd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11-f533dd.json
deleted file mode 100644
index 75edb81a87..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11-f533dd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f533dd05-f467-4045-85f2-de7ef31e3c43",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=9",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-f533dd05-f467-4045-85f2-de7ef31e3c43.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4369",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22fc58f23e2714334d25eb4214ba06bc\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE69A1:CCC7C4:5DB3A124",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=8>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=10>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "f533dd05-f467-4045-85f2-de7ef31e3c43",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11.json
new file mode 100644
index 0000000000..9071f4fb3c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "f533dd05-f467-4045-85f2-de7ef31e3c43",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=9",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-11.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4369",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22fc58f23e2714334d25eb4214ba06bc\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE69A1:CCC7C4:5DB3A124",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=8>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=10>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "f533dd05-f467-4045-85f2-de7ef31e3c43",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12-df03bd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12-df03bd.json
deleted file mode 100644
index bc6c840c65..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12-df03bd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "df03bd6c-ec4b-4911-8d43-58d2e2498eeb",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-df03bd6c-ec4b-4911-8d43-58d2e2498eeb.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4368",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dc7c9429ba6754da048c10782cb1f179\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6A39:CCC876:5DB3A125",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=9>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=11>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "df03bd6c-ec4b-4911-8d43-58d2e2498eeb",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12.json
new file mode 100644
index 0000000000..a25732e877
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "df03bd6c-ec4b-4911-8d43-58d2e2498eeb",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-12.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4368",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dc7c9429ba6754da048c10782cb1f179\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6A39:CCC876:5DB3A125",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=9>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=11>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "df03bd6c-ec4b-4911-8d43-58d2e2498eeb",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13-26bad5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13-26bad5.json
deleted file mode 100644
index e2c48bb809..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13-26bad5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "26bad52b-c62b-469b-885f-453d7b164aca",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=11",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-26bad52b-c62b-469b-885f-453d7b164aca.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4367",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5e1286b0346d440cdf82f6934ad50b07\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6AB8:CCC90E:5DB3A127",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=10>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=12>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "26bad52b-c62b-469b-885f-453d7b164aca",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13.json
new file mode 100644
index 0000000000..d734a84824
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "26bad52b-c62b-469b-885f-453d7b164aca",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=11",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-13.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4367",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5e1286b0346d440cdf82f6934ad50b07\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6AB8:CCC90E:5DB3A127",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=10>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=12>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "26bad52b-c62b-469b-885f-453d7b164aca",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14-8315bb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14-8315bb.json
deleted file mode 100644
index 1c9b0adef5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14-8315bb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8315bb73-ac7c-4890-83ee-8802c5eb57a6",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=12",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-8315bb73-ac7c-4890-83ee-8802c5eb57a6.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4366",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dff7835a112a2d8099e521b5a2d47f43\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6B3B:CCC9B0:5DB3A128",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=11>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=13>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "8315bb73-ac7c-4890-83ee-8802c5eb57a6",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14.json
new file mode 100644
index 0000000000..c825cafdf6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-14.json
@@ -0,0 +1,48 @@
+{
+  "id": "8315bb73-ac7c-4890-83ee-8802c5eb57a6",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=12",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-14.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4366",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dff7835a112a2d8099e521b5a2d47f43\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6B3B:CCC9B0:5DB3A128",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=11>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=13>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "8315bb73-ac7c-4890-83ee-8802c5eb57a6",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15-ecf517.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15-ecf517.json
deleted file mode 100644
index 02b3ad4d67..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15-ecf517.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ecf517ff-a34e-4190-9e4a-7ce48bccffae",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=13",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-ecf517ff-a34e-4190-9e4a-7ce48bccffae.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4365",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c16a4cbe21bf1365b8e325f49b1c094\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6BBC:CCCA49:5DB3A12A",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=12>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=14>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "ecf517ff-a34e-4190-9e4a-7ce48bccffae",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15.json
new file mode 100644
index 0000000000..1330eaea4f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-15.json
@@ -0,0 +1,48 @@
+{
+  "id": "ecf517ff-a34e-4190-9e4a-7ce48bccffae",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=13",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-15.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4365",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c16a4cbe21bf1365b8e325f49b1c094\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6BBC:CCCA49:5DB3A12A",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=12>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=14>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "ecf517ff-a34e-4190-9e4a-7ce48bccffae",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16-45dd04.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16-45dd04.json
deleted file mode 100644
index 63faf05753..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16-45dd04.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "45dd04d4-645f-47f2-8412-52e08b3c2e50",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=14",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-45dd04d4-645f-47f2-8412-52e08b3c2e50.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4364",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4b32f6b18b9629e771278f6dda4dba05\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6C62:CCCB0A:5DB3A12C",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=13>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=15>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "45dd04d4-645f-47f2-8412-52e08b3c2e50",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16.json
new file mode 100644
index 0000000000..142e172e53
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-16.json
@@ -0,0 +1,48 @@
+{
+  "id": "45dd04d4-645f-47f2-8412-52e08b3c2e50",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=14",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-16.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4364",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4b32f6b18b9629e771278f6dda4dba05\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6C62:CCCB0A:5DB3A12C",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=13>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=15>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "45dd04d4-645f-47f2-8412-52e08b3c2e50",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17-a73c5a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17-a73c5a.json
deleted file mode 100644
index 37ff7e0967..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17-a73c5a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a73c5a75-e101-4321-aea4-c633929320e8",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=15",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-a73c5a75-e101-4321-aea4-c633929320e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4363",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"49628812c8415ff7e30cbd47c41380e3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6CD6:CCCB8F:5DB3A12D",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=14>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=16>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "a73c5a75-e101-4321-aea4-c633929320e8",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17.json
new file mode 100644
index 0000000000..05e6ae227a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-17.json
@@ -0,0 +1,48 @@
+{
+  "id": "a73c5a75-e101-4321-aea4-c633929320e8",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=15",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-17.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4363",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"49628812c8415ff7e30cbd47c41380e3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6CD6:CCCB8F:5DB3A12D",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=14>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=16>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "a73c5a75-e101-4321-aea4-c633929320e8",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18-e66682.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18-e66682.json
deleted file mode 100644
index d2d92c529e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18-e66682.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e66682bb-4a55-4cf9-9092-9c3aaf6dc915",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=16",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-e66682bb-4a55-4cf9-9092-9c3aaf6dc915.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4362",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"80e5c08376b86ca959e5ce663392495b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6D71:CCCC49:5DB3A12F",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=15>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=17>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e66682bb-4a55-4cf9-9092-9c3aaf6dc915",
-  "persistent": true,
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18.json
new file mode 100644
index 0000000000..a3cb89333a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-18.json
@@ -0,0 +1,48 @@
+{
+  "id": "e66682bb-4a55-4cf9-9092-9c3aaf6dc915",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=16",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-18.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4362",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"80e5c08376b86ca959e5ce663392495b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6D71:CCCC49:5DB3A12F",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=15>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=17>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e66682bb-4a55-4cf9-9092-9c3aaf6dc915",
+  "persistent": true,
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19-0e04a7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19-0e04a7.json
deleted file mode 100644
index 30755c2517..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19-0e04a7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0e04a7f4-8a85-40ec-b90d-faf2822b648f",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=17",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-0e04a7f4-8a85-40ec-b90d-faf2822b648f.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4361",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3aefed6ac8c77c7cb6ef59828f783c4a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6DF4:CCCCE1:5DB3A130",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=16>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=18>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "0e04a7f4-8a85-40ec-b90d-faf2822b648f",
-  "persistent": true,
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19.json
new file mode 100644
index 0000000000..ee5ef4a948
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-19.json
@@ -0,0 +1,48 @@
+{
+  "id": "0e04a7f4-8a85-40ec-b90d-faf2822b648f",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=17",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-19.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4361",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3aefed6ac8c77c7cb6ef59828f783c4a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6DF4:CCCCE1:5DB3A130",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=16>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=18>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "0e04a7f4-8a85-40ec-b90d-faf2822b648f",
+  "persistent": true,
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20-5cb3f8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20-5cb3f8.json
deleted file mode 100644
index 2f1af91953..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20-5cb3f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5cb3f8b7-17fc-4a5b-a8b3-99c07a604469",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=18",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-5cb3f8b7-17fc-4a5b-a8b3-99c07a604469.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4360",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"79d26a423a1c544f61e199dc2df9557f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6E7D:CCCD81:5DB3A132",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=17>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=19>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "5cb3f8b7-17fc-4a5b-a8b3-99c07a604469",
-  "persistent": true,
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20.json
new file mode 100644
index 0000000000..b9f5f90a9f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-20.json
@@ -0,0 +1,48 @@
+{
+  "id": "5cb3f8b7-17fc-4a5b-a8b3-99c07a604469",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=18",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-20.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4360",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"79d26a423a1c544f61e199dc2df9557f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6E7D:CCCD81:5DB3A132",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=17>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=19>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "5cb3f8b7-17fc-4a5b-a8b3-99c07a604469",
+  "persistent": true,
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21-626ca8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21-626ca8.json
deleted file mode 100644
index 6b6f1eca65..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21-626ca8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "626ca8b6-883d-405d-a271-84b38deb0567",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=19",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-626ca8b6-883d-405d-a271-84b38deb0567.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4359",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8330160204af81f4a9b68b56bc96f637\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6EF5:CCCE0E:5DB3A133",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=18>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=20>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "626ca8b6-883d-405d-a271-84b38deb0567",
-  "persistent": true,
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21.json
new file mode 100644
index 0000000000..98ed27c87c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-21.json
@@ -0,0 +1,48 @@
+{
+  "id": "626ca8b6-883d-405d-a271-84b38deb0567",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=19",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-21.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4359",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8330160204af81f4a9b68b56bc96f637\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6EF5:CCCE0E:5DB3A133",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=18>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=20>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "626ca8b6-883d-405d-a271-84b38deb0567",
+  "persistent": true,
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22-e0e43c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22-e0e43c.json
deleted file mode 100644
index df62c3be24..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22-e0e43c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e0e43c36-cd33-4f86-b35d-165f964bf15e",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=20",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-e0e43c36-cd33-4f86-b35d-165f964bf15e.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4358",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c3172e936488f226d6f456b9364424d0\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6F6F:CCCEA3:5DB3A135",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=19>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=21>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "e0e43c36-cd33-4f86-b35d-165f964bf15e",
-  "persistent": true,
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22.json
new file mode 100644
index 0000000000..add784e03b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-22.json
@@ -0,0 +1,48 @@
+{
+  "id": "e0e43c36-cd33-4f86-b35d-165f964bf15e",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=20",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-22.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4358",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c3172e936488f226d6f456b9364424d0\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6F6F:CCCEA3:5DB3A135",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=19>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=21>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "e0e43c36-cd33-4f86-b35d-165f964bf15e",
+  "persistent": true,
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23-6f8a70.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23-6f8a70.json
deleted file mode 100644
index f19ea67a72..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23-6f8a70.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6f8a70ef-2168-4fad-8f28-d1ad0584525d",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=21",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-6f8a70ef-2168-4fad-8f28-d1ad0584525d.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4357",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"567a6bb7dcae1d867da8b781f159682c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6FC1:CCCF03:5DB3A136",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=20>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=22>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6f8a70ef-2168-4fad-8f28-d1ad0584525d",
-  "persistent": true,
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23.json
new file mode 100644
index 0000000000..7ed6829067
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-23.json
@@ -0,0 +1,48 @@
+{
+  "id": "6f8a70ef-2168-4fad-8f28-d1ad0584525d",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=21",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-23.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4357",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"567a6bb7dcae1d867da8b781f159682c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6FC1:CCCF03:5DB3A136",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=20>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=22>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6f8a70ef-2168-4fad-8f28-d1ad0584525d",
+  "persistent": true,
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24-aec88a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24-aec88a.json
deleted file mode 100644
index 1803826d38..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24-aec88a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "aec88ab4-fa24-43a9-93c9-82026978b8a7",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=22",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-aec88ab4-fa24-43a9-93c9-82026978b8a7.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4356",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9aeb29fde25b34a1c74e19094c7f1845\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE7019:CCCF64:5DB3A138",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=21>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "aec88ab4-fa24-43a9-93c9-82026978b8a7",
-  "persistent": true,
-  "insertionIndex": 24
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24.json
new file mode 100644
index 0000000000..19c2161db5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-24.json
@@ -0,0 +1,48 @@
+{
+  "id": "aec88ab4-fa24-43a9-93c9-82026978b8a7",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=22",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-24.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4356",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9aeb29fde25b34a1c74e19094c7f1845\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE7019:CCCF64:5DB3A138",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=21>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "aec88ab4-fa24-43a9-93c9-82026978b8a7",
+  "persistent": true,
+  "insertionIndex": 24
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25-d95d3c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25-d95d3c.json
deleted file mode 100644
index ad1e708074..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25-d95d3c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d95d3c51-42d4-4138-86ba-95b07d066993",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=23",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-d95d3c51-42d4-4138-86ba-95b07d066993.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4355",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aa914ce779a11314fd694b2f4cd74b27\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE708C:CCCFE3:5DB3A13A",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=22>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d95d3c51-42d4-4138-86ba-95b07d066993",
-  "persistent": true,
-  "insertionIndex": 25
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25.json
new file mode 100644
index 0000000000..c90e613ba1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-25.json
@@ -0,0 +1,48 @@
+{
+  "id": "d95d3c51-42d4-4138-86ba-95b07d066993",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=23",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-25.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4355",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aa914ce779a11314fd694b2f4cd74b27\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE708C:CCCFE3:5DB3A13A",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=22>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d95d3c51-42d4-4138-86ba-95b07d066993",
+  "persistent": true,
+  "insertionIndex": 25
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4-471f9b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4-471f9b.json
deleted file mode 100644
index 7bb72535bb..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4-471f9b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "471f9be3-9f94-4788-bd01-316c9e5d03a4",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-471f9be3-9f94-4788-bd01-316c9e5d03a4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4376",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"60284685b96e003cec05b128c4376eae\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE65D2:CCC35B:5DB3A118",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=3>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "471f9be3-9f94-4788-bd01-316c9e5d03a4",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4.json
new file mode 100644
index 0000000000..4c2c8db9f4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "471f9be3-9f94-4788-bd01-316c9e5d03a4",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4376",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"60284685b96e003cec05b128c4376eae\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE65D2:CCC35B:5DB3A118",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=3>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "471f9be3-9f94-4788-bd01-316c9e5d03a4",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5-d68a56.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5-d68a56.json
deleted file mode 100644
index 0b70d30962..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5-d68a56.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d68a564a-7eca-47ca-af21-1bb492309cfc",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-d68a564a-7eca-47ca-af21-1bb492309cfc.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4375",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7c59fb09be8ece8abce35d9c643d8bad\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE662B:CCC3BF:5DB3A119",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=2>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=4>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d68a564a-7eca-47ca-af21-1bb492309cfc",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5.json
new file mode 100644
index 0000000000..406f26756c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "d68a564a-7eca-47ca-af21-1bb492309cfc",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-5.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4375",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7c59fb09be8ece8abce35d9c643d8bad\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE662B:CCC3BF:5DB3A119",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=2>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=4>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d68a564a-7eca-47ca-af21-1bb492309cfc",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6-d4de5f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6-d4de5f.json
deleted file mode 100644
index 02295b9925..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6-d4de5f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d4de5f04-8979-4506-b24d-f4e2ca3af58a",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-d4de5f04-8979-4506-b24d-f4e2ca3af58a.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4374",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fb8408a690b13ff421b3de3bc76610cc\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE668D:CCC428:5DB3A11B",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=3>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=5>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d4de5f04-8979-4506-b24d-f4e2ca3af58a",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6.json
new file mode 100644
index 0000000000..62826f2f9d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "d4de5f04-8979-4506-b24d-f4e2ca3af58a",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-6.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4374",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fb8408a690b13ff421b3de3bc76610cc\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE668D:CCC428:5DB3A11B",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=3>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=5>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d4de5f04-8979-4506-b24d-f4e2ca3af58a",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7-db791f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7-db791f.json
deleted file mode 100644
index 2dc285b779..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7-db791f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "db791f4d-4464-4055-80ae-83d017b7596d",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-db791f4d-4464-4055-80ae-83d017b7596d.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4373",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c3797e257caab1fbb549f25ea4fceb16\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE66F0:CCC4A0:5DB3A11D",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=4>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=6>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "db791f4d-4464-4055-80ae-83d017b7596d",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7.json
new file mode 100644
index 0000000000..758df80e34
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "db791f4d-4464-4055-80ae-83d017b7596d",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-7.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4373",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c3797e257caab1fbb549f25ea4fceb16\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE66F0:CCC4A0:5DB3A11D",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=4>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=6>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "db791f4d-4464-4055-80ae-83d017b7596d",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8-49da2f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8-49da2f.json
deleted file mode 100644
index 73884a989b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8-49da2f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "49da2fa3-254f-41d7-8a0f-1ba36c19eae4",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-49da2fa3-254f-41d7-8a0f-1ba36c19eae4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4372",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b1658a06cd48a38843aaf55e5bf89f23\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE676A:CCC53D:5DB3A11E",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=5>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=7>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "49da2fa3-254f-41d7-8a0f-1ba36c19eae4",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8.json
new file mode 100644
index 0000000000..721759b4d2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "49da2fa3-254f-41d7-8a0f-1ba36c19eae4",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-8.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4372",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b1658a06cd48a38843aaf55e5bf89f23\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE676A:CCC53D:5DB3A11E",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=5>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=7>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "49da2fa3-254f-41d7-8a0f-1ba36c19eae4",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9-d4d7b2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9-d4d7b2.json
deleted file mode 100644
index cc005328fa..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9-d4d7b2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d4d7b222-62d1-4d88-bab9-ccf707f314e4",
-  "name": "organizations_107424_repos",
-  "request": {
-    "url": "/organizations/107424/repos?per_page=100&page=7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_107424_repos-d4d7b222-62d1-4d88-bab9-ccf707f314e4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4371",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bdf18f3fd18e4806ab91e0dce554e454\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE67D9:CCC5BD:5DB3A120",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=6>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=8>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d4d7b222-62d1-4d88-bab9-ccf707f314e4",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9.json
new file mode 100644
index 0000000000..0e28d11f98
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/organizations_107424_repos-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "d4d7b222-62d1-4d88-bab9-ccf707f314e4",
+  "name": "organizations_107424_repos",
+  "request": {
+    "url": "/organizations/107424/repos?per_page=100&page=7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_107424_repos-9.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4371",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bdf18f3fd18e4806ab91e0dce554e454\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE67D9:CCC5BD:5DB3A120",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=6>; rel=\"prev\", <https://api.github.com/organizations/107424/repos?per_page=100&page=8>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\", <https://api.github.com/organizations/107424/repos?per_page=100&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d4d7b222-62d1-4d88-bab9-ccf707f314e4",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2-72681a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2-72681a.json
deleted file mode 100644
index 89f173af09..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2-72681a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "72681a2c-9db9-44b8-a9cf-4084568695a0",
-  "name": "orgs_jenkinsci",
-  "request": {
-    "url": "/orgs/jenkinsci",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci-72681a2c-9db9-44b8-a9cf-4084568695a0.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4378",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ee1dcb6549b6c8fc14267ae3abde8f38\"",
-      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6571:CCC2E4:5DB3A116"
-    }
-  },
-  "uuid": "72681a2c-9db9-44b8-a9cf-4084568695a0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2.json
new file mode 100644
index 0000000000..e6eb4597ca
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "72681a2c-9db9-44b8-a9cf-4084568695a0",
+  "name": "orgs_jenkinsci",
+  "request": {
+    "url": "/orgs/jenkinsci",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4378",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ee1dcb6549b6c8fc14267ae3abde8f38\"",
+      "Last-Modified": "Mon, 25 Feb 2019 15:26:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6571:CCC2E4:5DB3A116"
+    }
+  },
+  "uuid": "72681a2c-9db9-44b8-a9cf-4084568695a0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3-75d09b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3-75d09b.json
deleted file mode 100644
index 262380cf2f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3-75d09b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "75d09b41-374d-4c15-b8fd-06b9e1e8402c",
-  "name": "orgs_jenkinsci_repos",
-  "request": {
-    "url": "/orgs/jenkinsci/repos?per_page=100",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_jenkinsci_repos-75d09b41-374d-4c15-b8fd-06b9e1e8402c.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:52 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4377",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1caec6c3f332ee8e63f7a78e2e80a43b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE657F:CCC2FC:5DB3A116",
-      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=2>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\""
-    }
-  },
-  "uuid": "75d09b41-374d-4c15-b8fd-06b9e1e8402c",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3.json
new file mode 100644
index 0000000000..ec42d6e163
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/orgs_jenkinsci_repos-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "75d09b41-374d-4c15-b8fd-06b9e1e8402c",
+  "name": "orgs_jenkinsci_repos",
+  "request": {
+    "url": "/orgs/jenkinsci/repos?per_page=100",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_jenkinsci_repos-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:52 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4377",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1caec6c3f332ee8e63f7a78e2e80a43b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE657F:CCC2FC:5DB3A116",
+      "Link": "<https://api.github.com/organizations/107424/repos?per_page=100&page=2>; rel=\"next\", <https://api.github.com/organizations/107424/repos?per_page=100&page=23>; rel=\"last\""
+    }
+  },
+  "uuid": "75d09b41-374d-4c15-b8fd-06b9e1e8402c",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1-50e8f5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1-50e8f5.json
deleted file mode 100644
index 625aea2a8c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1-50e8f5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "50e8f530-8812-4f8d-afb0-8c5fc9294507",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-50e8f530-8812-4f8d-afb0-8c5fc9294507.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4380",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAC4:1CC6:AE6562:CCC2D7:5DB3A116"
-    }
-  },
-  "uuid": "50e8f530-8812-4f8d-afb0-8c5fc9294507",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1.json
new file mode 100644
index 0000000000..9ebf95eacd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgRepositories/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "50e8f530-8812-4f8d-afb0-8c5fc9294507",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4380",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAC4:1CC6:AE6562:CCC2D7:5DB3A116"
+    }
+  },
+  "uuid": "50e8f530-8812-4f8d-afb0-8c5fc9294507",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org-4f288ca6-2584-436c-9700-fa1e99e18587.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org-4f288ca6-2584-436c-9700-fa1e99e18587.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org_teams-b980fc5b-1824-4692-b40e-3d54a610c539.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org_teams-b980fc5b-1824-4692-b40e-3d54a610c539.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/user-d4155364-c1f5-4f54-bd13-38ab188af938.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/user-d4155364-c1f5-4f54-bd13-38ab188af938.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2-4f288c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2-4f288c.json
deleted file mode 100644
index 0241a925a1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2-4f288c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4f288ca6-2584-436c-9700-fa1e99e18587",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4f288ca6-2584-436c-9700-fa1e99e18587.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4304",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF5:45A4:C14726:DF124B:5DB3A145"
-    }
-  },
-  "uuid": "4f288ca6-2584-436c-9700-fa1e99e18587",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..ccb74e5d00
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4f288ca6-2584-436c-9700-fa1e99e18587",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4304",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF5:45A4:C14726:DF124B:5DB3A145"
+    }
+  },
+  "uuid": "4f288ca6-2584-436c-9700-fa1e99e18587",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3-b980fc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3-b980fc.json
deleted file mode 100644
index 19a08d9915..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3-b980fc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "b980fc5b-1824-4692-b40e-3d54a610c539",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-b980fc5b-1824-4692-b40e-3d54a610c539.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4303",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF5:45A4:C14736:DF1268:5DB3A146"
-    }
-  },
-  "uuid": "b980fc5b-1824-4692-b40e-3d54a610c539",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..6c74bc1252
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "b980fc5b-1824-4692-b40e-3d54a610c539",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4303",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF5:45A4:C14736:DF1268:5DB3A146"
+    }
+  },
+  "uuid": "b980fc5b-1824-4692-b40e-3d54a610c539",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1-d41553.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1-d41553.json
deleted file mode 100644
index ea54993c1f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1-d41553.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d4155364-c1f5-4f54-bd13-38ab188af938",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d4155364-c1f5-4f54-bd13-38ab188af938.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4306",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF5:45A4:C14713:DF1242:5DB3A145"
-    }
-  },
-  "uuid": "d4155364-c1f5-4f54-bd13-38ab188af938",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1.json
new file mode 100644
index 0000000000..c65d8d4dad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamByName/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d4155364-c1f5-4f54-bd13-38ab188af938",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4306",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF5:45A4:C14713:DF1242:5DB3A145"
+    }
+  },
+  "uuid": "d4155364-c1f5-4f54-bd13-38ab188af938",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org-805bfcf6-6b2a-4489-91d9-03c37286dfd5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org-805bfcf6-6b2a-4489-91d9-03c37286dfd5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams-44dbf3a1-23da-4193-a945-efe1f7977871.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams-44dbf3a1-23da-4193-a945-efe1f7977871.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams_core-developers-b7236bc9-4447-4721-acdb-7598066525d6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams_core-developers-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams_core-developers-b7236bc9-4447-4721-acdb-7598066525d6.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/orgs_github-api-test-org_teams_core-developers-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/user-04565ff3-3827-4bce-b8bc-69aa2b88374b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/user-04565ff3-3827-4bce-b8bc-69aa2b88374b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2-805bfc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2-805bfc.json
deleted file mode 100644
index 2cbdf50894..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2-805bfc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "805bfcf6-6b2a-4489-91d9-03c37286dfd5",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-805bfcf6-6b2a-4489-91d9-03c37286dfd5.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4300",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF9:3648:A50991:C32F64:5DB3A146"
-    }
-  },
-  "uuid": "805bfcf6-6b2a-4489-91d9-03c37286dfd5",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..d8a86b41e8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "805bfcf6-6b2a-4489-91d9-03c37286dfd5",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4300",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF9:3648:A50991:C32F64:5DB3A146"
+    }
+  },
+  "uuid": "805bfcf6-6b2a-4489-91d9-03c37286dfd5",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3-44dbf3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3-44dbf3.json
deleted file mode 100644
index e419fcea80..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3-44dbf3.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "44dbf3a1-23da-4193-a945-efe1f7977871",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-44dbf3a1-23da-4193-a945-efe1f7977871.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4299",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF9:3648:A5099D:C32F76:5DB3A147"
-    }
-  },
-  "uuid": "44dbf3a1-23da-4193-a945-efe1f7977871",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..13c2cda446
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "44dbf3a1-23da-4193-a945-efe1f7977871",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4299",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF9:3648:A5099D:C32F76:5DB3A147"
+    }
+  },
+  "uuid": "44dbf3a1-23da-4193-a945-efe1f7977871",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4-b7236b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4-b7236b.json
deleted file mode 100644
index 91f767790f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4-b7236b.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "b7236bc9-4447-4721-acdb-7598066525d6",
-  "name": "orgs_github-api-test-org_teams_core-developers",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/core-developers",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_core-developers-b7236bc9-4447-4721-acdb-7598066525d6.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:18:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4995",
-      "X-RateLimit-Reset": "1584440312",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
-      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F97C:520F:195318:2E8EA9:5E7095FA"
-    }
-  },
-  "uuid": "b7236bc9-4447-4721-acdb-7598066525d6",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4.json
new file mode 100644
index 0000000000..3524a1f4c0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/orgs_github-api-test-org_teams_core-developers-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "b7236bc9-4447-4721-acdb-7598066525d6",
+  "name": "orgs_github-api-test-org_teams_core-developers",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/core-developers",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_core-developers-4.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:18:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4995",
+      "X-RateLimit-Reset": "1584440312",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
+      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F97C:520F:195318:2E8EA9:5E7095FA"
+    }
+  },
+  "uuid": "b7236bc9-4447-4721-acdb-7598066525d6",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1-04565f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1-04565f.json
deleted file mode 100644
index 134a1437a5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1-04565f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "04565ff3-3827-4bce-b8bc-69aa2b88374b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-04565ff3-3827-4bce-b8bc-69aa2b88374b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4302",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF9:3648:A50983:C32F5E:5DB3A146"
-    }
-  },
-  "uuid": "04565ff3-3827-4bce-b8bc-69aa2b88374b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1.json
new file mode 100644
index 0000000000..abf73f1083
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeamBySlug/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "04565ff3-3827-4bce-b8bc-69aa2b88374b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4302",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF9:3648:A50983:C32F5E:5DB3A146"
+    }
+  },
+  "uuid": "04565ff3-3827-4bce-b8bc-69aa2b88374b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org-4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org-4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org_teams-625f653e-9301-47ba-9bc5-2e25be8ba17e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org_teams-625f653e-9301-47ba-9bc5-2e25be8ba17e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/user-fc66c1e3-e6a4-4802-a5e2-8b948612ec57.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/user-fc66c1e3-e6a4-4802-a5e2-8b948612ec57.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2-4a4f8e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2-4a4f8e.json
deleted file mode 100644
index 27e4ffe954..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2-4a4f8e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:29:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4232",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB2B:1CC8:E9880E:112B6F5:5DB3A160"
-    }
-  },
-  "uuid": "4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..764bfb8a18
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:29:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4232",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB2B:1CC8:E9880E:112B6F5:5DB3A160"
+    }
+  },
+  "uuid": "4a4f8ecc-e1ea-4c8f-9c74-b6de4241a3ae",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3-625f65.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3-625f65.json
deleted file mode 100644
index 4c024af385..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3-625f65.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "625f653e-9301-47ba-9bc5-2e25be8ba17e",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-625f653e-9301-47ba-9bc5-2e25be8ba17e.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:29:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4231",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB2B:1CC8:E9884A:112B73B:5DB3A160"
-    }
-  },
-  "uuid": "625f653e-9301-47ba-9bc5-2e25be8ba17e",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..2b0804409a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "625f653e-9301-47ba-9bc5-2e25be8ba17e",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:29:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4231",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB2B:1CC8:E9884A:112B73B:5DB3A160"
+    }
+  },
+  "uuid": "625f653e-9301-47ba-9bc5-2e25be8ba17e",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1-fc66c1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1-fc66c1.json
deleted file mode 100644
index d0c54bf1fe..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1-fc66c1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fc66c1e3-e6a4-4802-a5e2-8b948612ec57",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-fc66c1e3-e6a4-4802-a5e2-8b948612ec57.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:29:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4234",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB2B:1CC8:E987DA:112B6D1:5DB3A160"
-    }
-  },
-  "uuid": "fc66c1e3-e6a4-4802-a5e2-8b948612ec57",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1.json
new file mode 100644
index 0000000000..2400725989
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrgTeams/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "fc66c1e3-e6a4-4802-a5e2-8b948612ec57",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:29:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4234",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB2B:1CC8:E987DA:112B6D1:5DB3A160"
+    }
+  },
+  "uuid": "fc66c1e3-e6a4-4802-a5e2-8b948612ec57",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org-bbf24d32-ddda-44fe-acc3-003e9f629f32.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org-bbf24d32-ddda-44fe-acc3-003e9f629f32.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org_teams-7e66f997-9af6-4cab-826b-807692be0274.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org_teams-7e66f997-9af6-4cab-826b-807692be0274.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/repos_github-api-test-org_jenkins-1d18fc38-3b70-493e-81d7-3061d559a046.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/repos_github-api-test-org_jenkins-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/repos_github-api-test-org_jenkins-1d18fc38-3b70-493e-81d7-3061d559a046.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/repos_github-api-test-org_jenkins-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/user-0a855cde-5f76-4227-889d-462ad0dbd34b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/user-0a855cde-5f76-4227-889d-462ad0dbd34b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2-bbf24d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2-bbf24d.json
deleted file mode 100644
index ec15ada2db..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2-bbf24d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bbf24d32-ddda-44fe-acc3-003e9f629f32",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-bbf24d32-ddda-44fe-acc3-003e9f629f32.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4467",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA6D:1CC8:E95478:1127A0F:5DB3A0E5"
-    }
-  },
-  "uuid": "bbf24d32-ddda-44fe-acc3-003e9f629f32",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..e5285c6844
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "bbf24d32-ddda-44fe-acc3-003e9f629f32",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4467",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA6D:1CC8:E95478:1127A0F:5DB3A0E5"
+    }
+  },
+  "uuid": "bbf24d32-ddda-44fe-acc3-003e9f629f32",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3-7e66f9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3-7e66f9.json
deleted file mode 100644
index 81fe8e2a98..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3-7e66f9.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "7e66f997-9af6-4cab-826b-807692be0274",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-7e66f997-9af6-4cab-826b-807692be0274.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4466",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA6D:1CC8:E954AA:1127AC0:5DB3A0E6"
-    }
-  },
-  "uuid": "7e66f997-9af6-4cab-826b-807692be0274",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..040de8dc4a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "7e66f997-9af6-4cab-826b-807692be0274",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4466",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70d5cec1d50dff5493d435d403a622d2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA6D:1CC8:E954AA:1127AC0:5DB3A0E6"
+    }
+  },
+  "uuid": "7e66f997-9af6-4cab-826b-807692be0274",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4-1d18fc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4-1d18fc.json
deleted file mode 100644
index b1998d6ea1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4-1d18fc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1d18fc38-3b70-493e-81d7-3061d559a046",
-  "name": "repos_github-api-test-org_jenkins",
-  "request": {
-    "url": "/repos/github-api-test-org/jenkins",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_jenkins-1d18fc38-3b70-493e-81d7-3061d559a046.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4465",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"25c097d06bcfe5d2ac907141b83b63cd\"",
-      "Last-Modified": "Fri, 06 Sep 2019 23:21:35 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA6D:1CC8:E954CD:1127AE6:5DB3A0E6"
-    }
-  },
-  "uuid": "1d18fc38-3b70-493e-81d7-3061d559a046",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4.json
new file mode 100644
index 0000000000..6336ce3dbc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/repos_github-api-test-org_jenkins-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "1d18fc38-3b70-493e-81d7-3061d559a046",
+  "name": "repos_github-api-test-org_jenkins",
+  "request": {
+    "url": "/repos/github-api-test-org/jenkins",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_jenkins-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4465",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"25c097d06bcfe5d2ac907141b83b63cd\"",
+      "Last-Modified": "Fri, 06 Sep 2019 23:21:35 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA6D:1CC8:E954CD:1127AE6:5DB3A0E6"
+    }
+  },
+  "uuid": "1d18fc38-3b70-493e-81d7-3061d559a046",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1-0a855c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1-0a855c.json
deleted file mode 100644
index ec3e8b8e9e..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1-0a855c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0a855cde-5f76-4227-889d-462ad0dbd34b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-0a855cde-5f76-4227-889d-462ad0dbd34b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4469",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA6D:1CC8:E953DF:11279DF:5DB3A0E5"
-    }
-  },
-  "uuid": "0a855cde-5f76-4227-889d-462ad0dbd34b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1.json
new file mode 100644
index 0000000000..d570152ad3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testOrganization/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "0a855cde-5f76-4227-889d-462ad0dbd34b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4469",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA6D:1CC8:E953DF:11279DF:5DB3A0E5"
+    }
+  },
+  "uuid": "0a855cde-5f76-4227-889d-462ad0dbd34b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/rate_limit-195911b7-d3b7-4eb4-9d1e-f39465b89bb8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/rate_limit-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/rate_limit-195911b7-d3b7-4eb4-9d1e-f39465b89bb8.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/rate_limit-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/user-50a73d49-27a4-470e-bd8d-0665521673e3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/user-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/user-50a73d49-27a4-470e-bd8d-0665521673e3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/__files/user-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1-195911.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1-195911.json
deleted file mode 100644
index 34d67e6beb..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1-195911.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "195911b7-d3b7-4eb4-9d1e-f39465b89bb8",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-195911b7-d3b7-4eb4-9d1e-f39465b89bb8.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4944",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "C2CD:3CA2:BB7551:E0A7D6:5D951933"
-    }
-  },
-  "uuid": "195911b7-d3b7-4eb4-9d1e-f39465b89bb8",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1.json
new file mode 100644
index 0000000000..506eda13b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/rate_limit-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "195911b7-d3b7-4eb4-9d1e-f39465b89bb8",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4944",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "C2CD:3CA2:BB7551:E0A7D6:5D951933"
+    }
+  },
+  "uuid": "195911b7-d3b7-4eb4-9d1e-f39465b89bb8",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2-50a73d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2-50a73d.json
deleted file mode 100644
index c3c07f47a2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2-50a73d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "50a73d49-27a4-470e-bd8d-0665521673e3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-50a73d49-27a4-470e-bd8d-0665521673e3.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:57:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4781",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3A2:3CA2:1359183:172D570:5D9644A4"
-    }
-  },
-  "uuid": "50a73d49-27a4-470e-bd8d-0665521673e3",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2.json
new file mode 100644
index 0000000000..f4aafcb54a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRateLimit/mappings/user-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "50a73d49-27a4-470e-bd8d-0665521673e3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:57:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4781",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3A2:3CA2:1359183:172D570:5D9644A4"
+    }
+  },
+  "uuid": "50a73d49-27a4-470e-bd8d-0665521673e3",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme-bb7dedcd-c56b-455f-b7b3-3ff0d715b07e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme-bb7dedcd-c56b-455f-b7b3-3ff0d715b07e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme_readme-7d02eec3-3ed8-490a-a064-d4b60ce8b6ce.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme_readme-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme_readme-7d02eec3-3ed8-490a-a064-d4b60ce8b6ce.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/repos_github-api-test-org_test-readme_readme-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/user-6da871aa-818a-4d9c-a356-cb1cba2237ac.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/user-6da871aa-818a-4d9c-a356-cb1cba2237ac.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2-bb7ded.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2-bb7ded.json
deleted file mode 100644
index db29398071..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2-bb7ded.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bb7dedcd-c56b-455f-b7b3-3ff0d715b07e",
-  "name": "repos_github-api-test-org_test-readme",
-  "request": {
-    "url": "/repos/github-api-test-org/test-readme",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-readme-bb7dedcd-c56b-455f-b7b3-3ff0d715b07e.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 01:44:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4710",
-      "X-RateLimit-Reset": "1582337639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"0be703a668b5857b3e4dea3678da4eee\"",
-      "Last-Modified": "Sun, 15 Feb 2015 14:24:54 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DD5E:9E3D:5B85A3:6D731D:5E508784"
-    }
-  },
-  "uuid": "bb7dedcd-c56b-455f-b7b3-3ff0d715b07e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2.json
new file mode 100644
index 0000000000..23c88c8590
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "bb7dedcd-c56b-455f-b7b3-3ff0d715b07e",
+  "name": "repos_github-api-test-org_test-readme",
+  "request": {
+    "url": "/repos/github-api-test-org/test-readme",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-readme-2.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 01:44:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4710",
+      "X-RateLimit-Reset": "1582337639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"0be703a668b5857b3e4dea3678da4eee\"",
+      "Last-Modified": "Sun, 15 Feb 2015 14:24:54 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DD5E:9E3D:5B85A3:6D731D:5E508784"
+    }
+  },
+  "uuid": "bb7dedcd-c56b-455f-b7b3-3ff0d715b07e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3-7d02ee.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3-7d02ee.json
deleted file mode 100644
index 1218adb5bb..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3-7d02ee.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7d02eec3-3ed8-490a-a064-d4b60ce8b6ce",
-  "name": "repos_github-api-test-org_test-readme_readme",
-  "request": {
-    "url": "/repos/github-api-test-org/test-readme/readme",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-readme_readme-7d02eec3-3ed8-490a-a064-d4b60ce8b6ce.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 01:44:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4709",
-      "X-RateLimit-Reset": "1582337639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"63f2cc8c439bf86ca51c18b021729ccf\"",
-      "Last-Modified": "Sun, 15 Feb 2015 14:25:06 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DD5E:9E3D:5B85B0:6D734E:5E508785"
-    }
-  },
-  "uuid": "7d02eec3-3ed8-490a-a064-d4b60ce8b6ce",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3.json
new file mode 100644
index 0000000000..deae82eb14
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/repos_github-api-test-org_test-readme_readme-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "7d02eec3-3ed8-490a-a064-d4b60ce8b6ce",
+  "name": "repos_github-api-test-org_test-readme_readme",
+  "request": {
+    "url": "/repos/github-api-test-org/test-readme/readme",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-readme_readme-3.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 01:44:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4709",
+      "X-RateLimit-Reset": "1582337639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"63f2cc8c439bf86ca51c18b021729ccf\"",
+      "Last-Modified": "Sun, 15 Feb 2015 14:25:06 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DD5E:9E3D:5B85B0:6D734E:5E508785"
+    }
+  },
+  "uuid": "7d02eec3-3ed8-490a-a064-d4b60ce8b6ce",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1-6da871.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1-6da871.json
deleted file mode 100644
index 49d4fa400d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1-6da871.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6da871aa-818a-4d9c-a356-cb1cba2237ac",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-6da871aa-818a-4d9c-a356-cb1cba2237ac.json",
-    "headers": {
-      "Date": "Sat, 22 Feb 2020 01:44:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4712",
-      "X-RateLimit-Reset": "1582337638",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DD5E:9E3D:5B8580:6D7312:5E508784"
-    }
-  },
-  "uuid": "6da871aa-818a-4d9c-a356-cb1cba2237ac",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1.json
new file mode 100644
index 0000000000..76e8a82d3a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testReadme/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "6da871aa-818a-4d9c-a356-cb1cba2237ac",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 22 Feb 2020 01:44:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4712",
+      "X-RateLimit-Reset": "1582337638",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DD5E:9E3D:5B8580:6D7312:5E508784"
+    }
+  },
+  "uuid": "6da871aa-818a-4d9c-a356-cb1cba2237ac",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins-28457939-0c67-4c58-8f8e-8d44384f4506.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins-28457939-0c67-4c58-8f8e-8d44384f4506.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins_git_refs_heads_master-257aa346-b2fa-4808-a587-ce26a6859bf7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins_git_refs_heads_master-257aa346-b2fa-4808-a587-ce26a6859bf7.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/user-045baee3-176e-43e0-ab38-bdf00d276fe0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/user-045baee3-176e-43e0-ab38-bdf00d276fe0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2-284579.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2-284579.json
deleted file mode 100644
index 6399f621f8..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2-284579.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "28457939-0c67-4c58-8f8e-8d44384f4506",
-  "name": "repos_jenkinsci_jenkins",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins-28457939-0c67-4c58-8f8e-8d44384f4506.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4428",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA96:5F2B:EE3574:118787D:5DB3A105"
-    }
-  },
-  "uuid": "28457939-0c67-4c58-8f8e-8d44384f4506",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2.json
new file mode 100644
index 0000000000..528ab8dd60
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "28457939-0c67-4c58-8f8e-8d44384f4506",
+  "name": "repos_jenkinsci_jenkins",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4428",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bc93de689b79708d9501fd02bc1f7696\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA96:5F2B:EE3574:118787D:5DB3A105"
+    }
+  },
+  "uuid": "28457939-0c67-4c58-8f8e-8d44384f4506",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3-257aa3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3-257aa3.json
deleted file mode 100644
index 95fdbf5c66..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3-257aa3.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "257aa346-b2fa-4808-a587-ce26a6859bf7",
-  "name": "repos_jenkinsci_jenkins_git_refs_heads_master",
-  "request": {
-    "url": "/repos/jenkinsci/jenkins/git/refs/heads/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_jenkinsci_jenkins_git_refs_heads_master-257aa346-b2fa-4808-a587-ce26a6859bf7.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4427",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26417e404a981294e36569799ddf3df5\"",
-      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA96:5F2B:EE3584:118789E:5DB3A105"
-    }
-  },
-  "uuid": "257aa346-b2fa-4808-a587-ce26a6859bf7",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
new file mode 100644
index 0000000000..29b0ac76ba
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "257aa346-b2fa-4808-a587-ce26a6859bf7",
+  "name": "repos_jenkinsci_jenkins_git_refs_heads_master",
+  "request": {
+    "url": "/repos/jenkinsci/jenkins/git/refs/heads/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_jenkinsci_jenkins_git_refs_heads_master-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4427",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26417e404a981294e36569799ddf3df5\"",
+      "Last-Modified": "Sat, 26 Oct 2019 01:07:22 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA96:5F2B:EE3584:118789E:5DB3A105"
+    }
+  },
+  "uuid": "257aa346-b2fa-4808-a587-ce26a6859bf7",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1-045bae.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1-045bae.json
deleted file mode 100644
index cc359d7dee..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1-045bae.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "045baee3-176e-43e0-ab38-bdf00d276fe0",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-045baee3-176e-43e0-ab38-bdf00d276fe0.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4430",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA96:5F2B:EE3556:1187866:5DB3A105"
-    }
-  },
-  "uuid": "045baee3-176e-43e0-ab38-bdf00d276fe0",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1.json
new file mode 100644
index 0000000000..da4f9cc04a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "045baee3-176e-43e0-ab38-bdf00d276fe0",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4430",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA96:5F2B:EE3556:1187866:5DB3A105"
+    }
+  },
+  "uuid": "045baee3-176e-43e0-ab38-bdf00d276fe0",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user-3068cd06-63e4-4658-a037-d113f99314af.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user-3068cd06-63e4-4658-a037-d113f99314af.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user_repos-ead41396-5e65-4478-8e81-03bb7cd5d2d1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user_repos-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user_repos-ead41396-5e65-4478-8e81-03bb7cd5d2d1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/__files/user_repos-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2-b1b919.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2-b1b919.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3-397146.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3-397146.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4-b0c111.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4-b0c111.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5-6cc04a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5-6cc04a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7-c1bd7f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-8-17b2c9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-8-17b2c9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/repos_bitwiseman_github-api-test-rename2-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6-3068cd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6-3068cd.json
deleted file mode 100644
index 03b5ba7359..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6-3068cd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3068cd06-63e4-4658-a037-d113f99314af",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3068cd06-63e4-4658-a037-d113f99314af.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2C4:9578:8B9BEC:A6E86D:5D951932"
-    }
-  },
-  "uuid": "3068cd06-63e4-4658-a037-d113f99314af",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6.json
new file mode 100644
index 0000000000..1a5bfc49a7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "3068cd06-63e4-4658-a037-d113f99314af",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-6.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2C4:9578:8B9BEC:A6E86D:5D951932"
+    }
+  },
+  "uuid": "3068cd06-63e4-4658-a037-d113f99314af",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1-ead413.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1-ead413.json
deleted file mode 100644
index 5422ab1d8b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1-ead413.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "ead41396-5e65-4478-8e81-03bb7cd5d2d1",
-  "name": "user_repos",
-  "request": {
-    "url": "/user/repos",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"private\":false,\"name\":\"github-api-test-rename\",\"description\":\"a test repository\",\"homepage\":\"http://github-api.kohsuke.org/\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "user_repos-ead41396-5e65-4478-8e81-03bb7cd5d2d1.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"7932a8014acba04e742952d678d02a63\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/bitwiseman/github-api-test-rename",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2C4:9578:8B9AD6:A6E725:5D951930"
-    }
-  },
-  "uuid": "ead41396-5e65-4478-8e81-03bb7cd5d2d1",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1.json
new file mode 100644
index 0000000000..8f3ae5e8e3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoCRUD/mappings/user_repos-1.json
@@ -0,0 +1,55 @@
+{
+  "id": "ead41396-5e65-4478-8e81-03bb7cd5d2d1",
+  "name": "user_repos",
+  "request": {
+    "url": "/user/repos",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":false,\"name\":\"github-api-test-rename\",\"description\":\"a test repository\",\"homepage\":\"http://github-api.kohsuke.org/\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "user_repos-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"7932a8014acba04e742952d678d02a63\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/bitwiseman/github-api-test-rename",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2C4:9578:8B9AD6:A6E725:5D951930"
+    }
+  },
+  "uuid": "ead41396-5e65-4478-8e81-03bb7cd5d2d1",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels-47685ef9-9d9a-4e96-945b-b58a75e9807f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels-47685ef9-9d9a-4e96-945b-b58a75e9807f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels_labels-28c58b29-a050-4a83-b08e-bf202cff89a9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels_labels-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels_labels-28c58b29-a050-4a83-b08e-bf202cff89a9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/repos_github-api-test-org_test-labels_labels-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-1.json
new file mode 100644
index 0000000000..c77b3c73a0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-1.json
@@ -0,0 +1,45 @@
+{
+  "login": "bitwiseman",
+  "id": 1958953,
+  "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/bitwiseman",
+  "html_url": "https://github.com/bitwiseman",
+  "followers_url": "https://api.github.com/users/bitwiseman/followers",
+  "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+  "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+  "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+  "repos_url": "https://api.github.com/users/bitwiseman/repos",
+  "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Liam Newman",
+  "company": "Cloudbees, Inc.",
+  "blog": "",
+  "location": "Seattle, WA, USA",
+  "email": "bitwiseman@gmail.com",
+  "hireable": null,
+  "bio": "https://twitter.com/bitwiseman",
+  "public_repos": 181,
+  "public_gists": 7,
+  "followers": 149,
+  "following": 9,
+  "created_at": "2012-07-11T20:38:33Z",
+  "updated_at": "2020-03-26T21:08:45Z",
+  "private_gists": 8,
+  "total_private_repos": 10,
+  "owned_private_repos": 0,
+  "disk_usage": 33697,
+  "collaborators": 0,
+  "two_factor_authentication": true,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "collaborators": 0,
+    "private_repos": 10000
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-a78a0f34-4527-48ba-88f8-16c319430bc6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-a78a0f34-4527-48ba-88f8-16c319430bc6.json
deleted file mode 100644
index 05a796f5ba..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/__files/user-a78a0f34-4527-48ba-88f8-16c319430bc6.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "login": "bitwiseman",
-  "id": 1958953,
-  "node_id": "MDQ6VXNlcjE5NTg5NTM=",
-  "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
-  "gravatar_id": "",
-  "url": "https://api.github.com/users/bitwiseman",
-  "html_url": "https://github.com/bitwiseman",
-  "followers_url": "https://api.github.com/users/bitwiseman/followers",
-  "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
-  "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
-  "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
-  "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
-  "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
-  "repos_url": "https://api.github.com/users/bitwiseman/repos",
-  "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
-  "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
-  "type": "User",
-  "site_admin": false,
-  "name": "Liam Newman",
-  "company": "Cloudbees, Inc.",
-  "blog": "",
-  "location": "Seattle, WA, USA",
-  "email": "bitwiseman@gmail.com",
-  "hireable": null,
-  "bio": "https://twitter.com/bitwiseman",
-  "public_repos": 181,
-  "public_gists": 7,
-  "followers": 150,
-  "following": 9,
-  "created_at": "2012-07-11T20:38:33Z",
-  "updated_at": "2020-03-19T19:17:12Z",
-  "private_gists": 8,
-  "total_private_repos": 10,
-  "owned_private_repos": 0,
-  "disk_usage": 33697,
-  "collaborators": 0,
-  "two_factor_authentication": true,
-  "plan": {
-    "name": "free",
-    "space": 976562499,
-    "collaborators": 0,
-    "private_repos": 10000
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2-47685e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2-47685e.json
deleted file mode 100644
index a159930cff..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2-47685e.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "47685ef9-9d9a-4e96-945b-b58a75e9807f",
-  "name": "repos_github-api-test-org_test-labels",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-labels-47685ef9-9d9a-4e96-945b-b58a75e9807f.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"6b3e989ed9af12ce6cd75038c1664ab5\"",
-      "Last-Modified": "Sun, 15 Feb 2015 14:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:1232FC:1FE7E8:5E7A600D"
-    }
-  },
-  "uuid": "47685ef9-9d9a-4e96-945b-b58a75e9807f",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2.json
new file mode 100644
index 0000000000..527fd7cb39
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "e24be5d0-73bf-4748-8c79-a68eb5e2becf",
+  "name": "repos_github-api-test-org_test-labels",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-labels-2.json",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4993",
+      "X-RateLimit-Reset": "1585263138",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"6b3e989ed9af12ce6cd75038c1664ab5\"",
+      "Last-Modified": "Sun, 15 Feb 2015 14:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1CC:2452B:5E7D2411"
+    }
+  },
+  "uuid": "e24be5d0-73bf-4748-8c79-a68eb5e2becf",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15-6c2ac6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15-6c2ac6.json
deleted file mode 100644
index 47e1258536..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15-6c2ac6.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "id": "6c2ac6d2-3f11-4386-bb61-17ff5f183285",
-  "name": "repos_github-api-test-org_test-labels_labels",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"123457\",\"name\":\"test2\",\"description\":\"this is a different test\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "body": "{\"id\":1932142041,\"node_id\":\"MDU6TGFiZWwxOTMyMTQyMDQx\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test2\",\"name\":\"test2\",\"color\":\"123457\",\"default\":false,\"description\":\"this is a different test\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"c3c0744906ceb4103444a9bf92a50cd0\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/test-labels/labels/test2",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:123443:1FEB34:5E7A6011"
-    }
-  },
-  "uuid": "6c2ac6d2-3f11-4386-bb61-17ff5f183285",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15.json
new file mode 100644
index 0000000000..811a4804af
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-15.json
@@ -0,0 +1,53 @@
+{
+  "id": "2c942d88-1a5a-4fba-ae09-ada2a5dff83f",
+  "name": "repos_github-api-test-org_test-labels_labels",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"123457\",\"name\":\"test2\",\"description\":\"this is a different test\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "body": "{\"id\":1937402965,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTY1\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test2\",\"name\":\"test2\",\"color\":\"123457\",\"default\":false,\"description\":\"this is a different test\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "\"648a902d66c2f46f74c7b836969fdfe9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/test-labels/labels/test2",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D214:245B7:5E7D2416"
+    }
+  },
+  "uuid": "2c942d88-1a5a-4fba-ae09-ada2a5dff83f",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18-b1cf4b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18-b1cf4b.json
deleted file mode 100644
index 3bc13f1e1f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18-b1cf4b.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "id": "b1cf4bdd-f563-4831-8d5d-057fbee3ac86",
-  "name": "repos_github-api-test-org_test-labels_labels",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"123458\",\"name\":\"test2\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "body": "{\"id\":1932142052,\"node_id\":\"MDU6TGFiZWwxOTMyMTQyMDUy\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test2\",\"name\":\"test2\",\"color\":\"123458\",\"default\":false,\"description\":null}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"32b583a258d93b9d778a1e45ae9b163a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/test-labels/labels/test2",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:12349A:1FEBBA:5E7A6012"
-    }
-  },
-  "uuid": "b1cf4bdd-f563-4831-8d5d-057fbee3ac86",
-  "persistent": true,
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18.json
new file mode 100644
index 0000000000..0480a0f6f3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-18.json
@@ -0,0 +1,53 @@
+{
+  "id": "3f418ea2-7ad2-4a8d-a0e0-aa8dba0bc3aa",
+  "name": "repos_github-api-test-org_test-labels_labels",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"123458\",\"name\":\"test2\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "body": "{\"id\":1937403007,\"node_id\":\"MDU6TGFiZWwxOTM3NDAzMDA3\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test2\",\"name\":\"test2\",\"color\":\"123458\",\"default\":false,\"description\":null}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4977",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "\"b44c275d6657bfc2df3d5bfe449bff8d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/test-labels/labels/test2",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D220:245C5:5E7D2416"
+    }
+  },
+  "uuid": "3f418ea2-7ad2-4a8d-a0e0-aa8dba0bc3aa",
+  "persistent": true,
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3-28c58b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3-28c58b.json
deleted file mode 100644
index 9d464b7f51..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3-28c58b.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "28c58b29-a050-4a83-b08e-bf202cff89a9",
-  "name": "repos_github-api-test-org_test-labels_labels",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-labels_labels-28c58b29-a050-4a83-b08e-bf202cff89a9.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"e7c4fba8fbd1312b7b8bc4cac1dfbc25\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:12330F:1FE940:5E7A600E"
-    }
-  },
-  "uuid": "28c58b29-a050-4a83-b08e-bf202cff89a9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3.json
new file mode 100644
index 0000000000..2f5ac0f2dc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "2ec8e57b-45b1-417f-bc4e-6ea23334d4df",
+  "name": "repos_github-api-test-org_test-labels_labels",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-labels_labels-3.json",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"e7c4fba8fbd1312b7b8bc4cac1dfbc25\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1D0:2455A:5E7D2413"
+    }
+  },
+  "uuid": "2ec8e57b-45b1-417f-bc4e-6ea23334d4df",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5-154147.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5-154147.json
deleted file mode 100644
index 366ec7772c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5-154147.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "id": "154147fd-99f6-4b3f-8fec-3e4ea72e9fc5",
-  "name": "repos_github-api-test-org_test-labels_labels",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"123456\",\"name\":\"test\",\"description\":\"\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4984",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"746fc424803851d22aad5357c01c224f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/test-labels/labels/test",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:123338:1FE97F:5E7A600F"
-    }
-  },
-  "uuid": "154147fd-99f6-4b3f-8fec-3e4ea72e9fc5",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5.json
new file mode 100644
index 0000000000..7f11c462f6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels-5.json
@@ -0,0 +1,53 @@
+{
+  "id": "95656815-d16d-4592-9678-10766659ddeb",
+  "name": "repos_github-api-test-org_test-labels_labels",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"123456\",\"name\":\"test\",\"description\":\"\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "\"48de34595ef7992c2e74e8ceb548cdfa\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/test-labels/labels/test",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1D9:24565:5E7D2413"
+    }
+  },
+  "uuid": "95656815-d16d-4592-9678-10766659ddeb",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4-e1469d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4-e1469d.json
deleted file mode 100644
index 9ca0baec64..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4-e1469d.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "e1469d4c-5c2e-4efc-8dc4-53336da555a8",
-  "name": "repos_github-api-test-org_test-labels_labels_enhancement",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/enhancement",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":177339106,\"node_id\":\"MDU6TGFiZWwxNzczMzkxMDY=\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/enhancement\",\"name\":\"enhancement\",\"color\":\"84b6eb\",\"default\":true,\"description\":null}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4985",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"27ddcfc35bfde213e1754cfc9af09e7b\"",
-      "Last-Modified": "Sun, 15 Feb 2015 14:49:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:123322:1FE958:5E7A600E"
-    }
-  },
-  "uuid": "e1469d4c-5c2e-4efc-8dc4-53336da555a8",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4.json
new file mode 100644
index 0000000000..d1a8cd361c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_enhancement-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "2b5a3df5-478a-4539-b5ff-a1aa27b6a164",
+  "name": "repos_github-api-test-org_test-labels_labels_enhancement",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/enhancement",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":177339106,\"node_id\":\"MDU6TGFiZWwxNzczMzkxMDY=\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/enhancement\",\"name\":\"enhancement\",\"color\":\"84b6eb\",\"default\":true,\"description\":null}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"27ddcfc35bfde213e1754cfc9af09e7b\"",
+      "Last-Modified": "Sun, 15 Feb 2015 14:49:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1D4:24561:5E7D2413"
+    }
+  },
+  "uuid": "2b5a3df5-478a-4539-b5ff-a1aa27b6a164",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10-cace49.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10-cace49.json
deleted file mode 100644
index 24f08bdc92..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10-cace49.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "cace497a-c750-4a63-bfac-f0a8a155301c",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"000000\",\"name\":\"test\",\"description\":\"Deprecated\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"Deprecated\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"c2b4409465d0fa9da773d945ed7e93b7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:1233C3:1FEA6A:5E7A6010"
-    }
-  },
-  "uuid": "cace497a-c750-4a63-bfac-f0a8a155301c",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10.json
new file mode 100644
index 0000000000..9fdcea9f2e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-10.json
@@ -0,0 +1,52 @@
+{
+  "id": "cfabb012-1a36-4232-8f6d-e7d3f35673e3",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"000000\",\"name\":\"test\",\"description\":\"Deprecated\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"Deprecated\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4985",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"4a7241dfa969b562ba29b03b5ac9bc3a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1F5:2458C:5E7D2414"
+    }
+  },
+  "uuid": "cfabb012-1a36-4232-8f6d-e7d3f35673e3",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11-e4b594.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11-e4b594.json
deleted file mode 100644
index 9388aa79f5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11-e4b594.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "e4b59465-556e-4ecc-9fb7-476a9681503b",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"Deprecated\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"c2b4409465d0fa9da773d945ed7e93b7\"",
-      "Last-Modified": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:1233E5:1FEA9C:5E7A6010"
-    }
-  },
-  "uuid": "e4b59465-556e-4ecc-9fb7-476a9681503b",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-4",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11.json
new file mode 100644
index 0000000000..54a185eaa0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-11.json
@@ -0,0 +1,49 @@
+{
+  "id": "dce1e639-fea0-48b9-a21e-43f2dd9b77a1",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"Deprecated\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4984",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"4a7241dfa969b562ba29b03b5ac9bc3a\"",
+      "Last-Modified": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1FD:24595:5E7D2414"
+    }
+  },
+  "uuid": "dce1e639-fea0-48b9-a21e-43f2dd9b77a1",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-4",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12-0dad57.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12-0dad57.json
deleted file mode 100644
index c5d00101b2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12-0dad57.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "0dad57a0-5328-486e-a9c6-c5d1fd10695e",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"000000\",\"name\":\"test\",\"description\":\"this is also a test\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"this is also a test\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4977",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"70eb410be17b910e7f7ccbee623dc474\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:1233F8:1FEABA:5E7A6010"
-    }
-  },
-  "uuid": "0dad57a0-5328-486e-a9c6-c5d1fd10695e",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12.json
new file mode 100644
index 0000000000..1f393eec86
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-12.json
@@ -0,0 +1,52 @@
+{
+  "id": "73f6275a-8ea1-4697-9b93-608128f04e47",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"000000\",\"name\":\"test\",\"description\":\"this is also a test\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"this is also a test\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4983",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"d53816a82e924d1178daa76454ed6372\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D202:2459E:5E7D2415"
+    }
+  },
+  "uuid": "73f6275a-8ea1-4697-9b93-608128f04e47",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13-09f51c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13-09f51c.json
deleted file mode 100644
index 573fc9f2f2..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13-09f51c.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "09f51c88-5e9c-4c62-9dac-790df8a09d5d",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "DELETE",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 204,
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:29 GMT",
-      "Status": "204 No Content",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1585080826",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "C6C5:5608:12341A:1FEAEC:5E7A6010"
-    }
-  },
-  "uuid": "09f51c88-5e9c-4c62-9dac-790df8a09d5d",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13.json
new file mode 100644
index 0000000000..d00ecea1ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-13.json
@@ -0,0 +1,38 @@
+{
+  "id": "2f35559b-a057-4ebd-926e-37b89964ce0e",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "DELETE",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 204,
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:21 GMT",
+      "Server": "GitHub.com",
+      "Status": "204 No Content",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4982",
+      "X-RateLimit-Reset": "1585263137",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI",
+      "X-GitHub-Request-Id": "E69B:9495:1D208:245A7:5E7D2415"
+    }
+  },
+  "uuid": "2f35559b-a057-4ebd-926e-37b89964ce0e",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14-331784.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14-331784.json
deleted file mode 100644
index 2f5ce5d3f6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14-331784.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "id": "331784da-76b5-4592-bdd3-54afa7ffe0e0",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 404,
-    "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/issues/labels/#get-a-single-label\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "404 Not Found",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1585080826",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "C6C5:5608:123433:1FEB1F:5E7A6011"
-    }
-  },
-  "uuid": "331784da-76b5-4592-bdd3-54afa7ffe0e0",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-4",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14.json
new file mode 100644
index 0000000000..6dfe1d2ff9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-14.json
@@ -0,0 +1,42 @@
+{
+  "id": "0c78363a-0c1e-4070-9210-a890b324c506",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 404,
+    "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/issues/labels/#get-a-single-label\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "404 Not Found",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "1585263138",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI",
+      "X-GitHub-Request-Id": "E69B:9495:1D211:245AD:5E7D2415"
+    }
+  },
+  "uuid": "0c78363a-0c1e-4070-9210-a890b324c506",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-4",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6-bee660.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6-bee660.json
deleted file mode 100644
index d314eb6f15..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6-bee660.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "bee66039-139a-45d5-b7a9-79a79ceb82eb",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4983",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"746fc424803851d22aad5357c01c224f\"",
-      "Last-Modified": "Tue, 24 Mar 2020 19:31:27 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:12336D:1FE9D0:5E7A600F"
-    }
-  },
-  "uuid": "bee66039-139a-45d5-b7a9-79a79ceb82eb",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-2",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6.json
new file mode 100644
index 0000000000..8cc7639857
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-6.json
@@ -0,0 +1,49 @@
+{
+  "id": "3e2f3c6f-2300-4da5-a68a-e8ffc23cbaa7",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4989",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"48de34595ef7992c2e74e8ceb548cdfa\"",
+      "Last-Modified": "Thu, 26 Mar 2020 21:52:19 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1E0:24570:5E7D2413"
+    }
+  },
+  "uuid": "3e2f3c6f-2300-4da5-a68a-e8ffc23cbaa7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-2",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7-528317.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7-528317.json
deleted file mode 100644
index dc6f2fc2ef..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7-528317.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "52831797-1300-4176-bdd4-255cf2fcffde",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"000000\",\"name\":\"test\",\"description\":\"It is dark!\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"It is dark!\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4982",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"77e815d99a6b367bfe8ac24c7089d0bc\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:12337A:1FE9F2:5E7A600F"
-    }
-  },
-  "uuid": "52831797-1300-4176-bdd4-255cf2fcffde",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7.json
new file mode 100644
index 0000000000..a29658a7ae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-7.json
@@ -0,0 +1,52 @@
+{
+  "id": "6d637a44-3eff-4110-bb1f-dd9002d0e051",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"000000\",\"name\":\"test\",\"description\":\"It is dark!\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"000000\",\"default\":false,\"description\":\"It is dark!\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"14706c3016a6b3a0cfce85c5b6389c4e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1E3:24577:5E7D2414"
+    }
+  },
+  "uuid": "6d637a44-3eff-4110-bb1f-dd9002d0e051",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8-c772a0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8-c772a0.json
deleted file mode 100644
index ce5ba29fc5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8-c772a0.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "c772a03f-74cd-4858-99dc-c0a66e87fa14",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"color\":\"123456\",\"name\":\"test\",\"description\":\"Deprecated\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"Deprecated\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"69bac1389aaf32d0e34be0b0242c25ea\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:12339C:1FEA21:5E7A600F"
-    }
-  },
-  "uuid": "c772a03f-74cd-4858-99dc-c0a66e87fa14",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8.json
new file mode 100644
index 0000000000..2d7e66beae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-8.json
@@ -0,0 +1,52 @@
+{
+  "id": "6e6dba1e-604f-400c-8edc-9282547d33b2",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"color\":\"123456\",\"name\":\"test\",\"description\":\"Deprecated\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"Deprecated\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"362625bccae2af3dc55feed7298cb6eb\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1E9:2457F:5E7D2414"
+    }
+  },
+  "uuid": "6e6dba1e-604f-400c-8edc-9282547d33b2",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9-6aef5e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9-6aef5e.json
deleted file mode 100644
index 8bed64e452..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9-6aef5e.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "6aef5e0a-1161-41dc-b53e-7c8e9d40af50",
-  "name": "repos_github-api-test-org_test-labels_labels_test",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932141986,\"node_id\":\"MDU6TGFiZWwxOTMyMTQxOTg2\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"Deprecated\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"69bac1389aaf32d0e34be0b0242c25ea\"",
-      "Last-Modified": "Tue, 24 Mar 2020 19:31:28 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:1233B5:1FEA4A:5E7A6010"
-    }
-  },
-  "uuid": "6aef5e0a-1161-41dc-b53e-7c8e9d40af50",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-3",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9.json
new file mode 100644
index 0000000000..901858790e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test-9.json
@@ -0,0 +1,49 @@
+{
+  "id": "79ce6715-a164-4bb4-974c-7f20616f47d7",
+  "name": "repos_github-api-test-org_test-labels_labels_test",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402918,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTE4\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test\",\"name\":\"test\",\"color\":\"123456\",\"default\":false,\"description\":\"Deprecated\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"362625bccae2af3dc55feed7298cb6eb\"",
+      "Last-Modified": "Thu, 26 Mar 2020 21:52:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1F1:24586:5E7D2414"
+    }
+  },
+  "uuid": "79ce6715-a164-4bb4-974c-7f20616f47d7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-test-labels-labels-test",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-test-labels-labels-test-3",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16-6ad140.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16-6ad140.json
deleted file mode 100644
index bba2117df6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16-6ad140.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "6ad14098-9364-4042-aa19-c6079f947dc4",
-  "name": "repos_github-api-test-org_test-labels_labels_test2",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "body": "{\"id\":1932142041,\"node_id\":\"MDU6TGFiZWwxOTMyMTQyMDQx\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test2\",\"name\":\"test2\",\"color\":\"123457\",\"default\":false,\"description\":\"this is a different test\"}",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1585080825",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"c3c0744906ceb4103444a9bf92a50cd0\"",
-      "Last-Modified": "Tue, 24 Mar 2020 19:31:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:12346F:1FEB7B:5E7A6011"
-    }
-  },
-  "uuid": "6ad14098-9364-4042-aa19-c6079f947dc4",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16.json
new file mode 100644
index 0000000000..90227a486c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-16.json
@@ -0,0 +1,46 @@
+{
+  "id": "e64a0737-c9a7-4ca4-82ce-20e1d0937bbf",
+  "name": "repos_github-api-test-org_test-labels_labels_test2",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"id\":1937402965,\"node_id\":\"MDU6TGFiZWwxOTM3NDAyOTY1\",\"url\":\"https://api.github.com/repos/github-api-test-org/test-labels/labels/test2\",\"name\":\"test2\",\"color\":\"123457\",\"default\":false,\"description\":\"this is a different test\"}",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"648a902d66c2f46f74c7b836969fdfe9\"",
+      "Last-Modified": "Thu, 26 Mar 2020 21:52:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D219:245BC:5E7D2416"
+    }
+  },
+  "uuid": "e64a0737-c9a7-4ca4-82ce-20e1d0937bbf",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17-7c5913.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17-7c5913.json
deleted file mode 100644
index 5417e8ed7a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17-7c5913.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "7c5913e1-8b58-46e6-807b-e65a006e215b",
-  "name": "repos_github-api-test-org_test-labels_labels_test2",
-  "request": {
-    "url": "/repos/github-api-test-org/test-labels/labels/test2",
-    "method": "DELETE",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 204,
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:30 GMT",
-      "Status": "204 No Content",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1585080826",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "C6C5:5608:123480:1FEB9D:5E7A6011"
-    }
-  },
-  "uuid": "7c5913e1-8b58-46e6-807b-e65a006e215b",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17.json
new file mode 100644
index 0000000000..c73a2e245d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/repos_github-api-test-org_test-labels_labels_test2-17.json
@@ -0,0 +1,38 @@
+{
+  "id": "932ad601-65b1-4472-9b6a-13ead9cbc248",
+  "name": "repos_github-api-test-org_test-labels_labels_test2",
+  "request": {
+    "url": "/repos/github-api-test-org/test-labels/labels/test2",
+    "method": "DELETE",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 204,
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:22 GMT",
+      "Server": "GitHub.com",
+      "Status": "204 No Content",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "1585263137",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI",
+      "X-GitHub-Request-Id": "E69B:9495:1D21C:245BF:5E7D2416"
+    }
+  },
+  "uuid": "932ad601-65b1-4472-9b6a-13ead9cbc248",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1-a78a0f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1-a78a0f.json
deleted file mode 100644
index 46ef9c5a2f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1-a78a0f.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "a78a0f34-4527-48ba-88f8-16c319430bc6",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a78a0f34-4527-48ba-88f8-16c319430bc6.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 24 Mar 2020 19:31:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4993",
-      "X-RateLimit-Reset": "1585080826",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"6cede2c36b953eb0e7f982fbcb6eb76a\"",
-      "Last-Modified": "Thu, 19 Mar 2020 19:17:12 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C6C5:5608:123237:1FE7CB:5E7A600C"
-    }
-  },
-  "uuid": "a78a0f34-4527-48ba-88f8-16c319430bc6",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1.json
new file mode 100644
index 0000000000..c14f67258d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepoLabel/mappings/user-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "0a9dfe83-1110-41c7-9542-4c9d299f430f",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 26 Mar 2020 21:52:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4999",
+      "X-RateLimit-Reset": "1585263137",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With, X-GitHub-OpenAPI"
+      ],
+      "ETag": "W/\"ef9ba8a02c78b6a718bca0bca9f1bb5d\"",
+      "Last-Modified": "Thu, 26 Mar 2020 21:08:45 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E69B:9495:1D1A7:24524:5E7D2411"
+    }
+  },
+  "uuid": "0a9dfe83-1110-41c7-9542-4c9d299f430f",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-64af61d8-56b5-4b55-ad9f-ca9d6597e07a.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-64af61d8-56b5-4b55-ad9f-ca9d6597e07a.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-a1a05f8b-7bd8-4200-a587-fd99f720508b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-a1a05f8b-7bd8-4200-a587-fd99f720508b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-51dabcc5-7825-4251-b560-8927ffa265b5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-51dabcc5-7825-4251-b560-8927ffa265b5.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-c71176ad-bfc9-4e39-aed8-6c4abd1c5979.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-c71176ad-bfc9-4e39-aed8-6c4abd1c5979.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit_readme-459f3734-bfaa-4f29-97fd-69574b66d965.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit_readme-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit_readme-459f3734-bfaa-4f29-97fd-69574b66d965.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/repos_bitwiseman_github-api-test-autoinit_readme-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user-b16c3b01-8cf2-4f90-a77a-f6ff9e371db0.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user-b16c3b01-8cf2-4f90-a77a-f6ff9e371db0.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user_repos-7be48128-4960-4274-8681-118897a274af.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user_repos-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user_repos-7be48128-4960-4274-8681-118897a274af.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/__files/user_repos-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2-64af61.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2-64af61.json
deleted file mode 100644
index 408cbdeb5f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2-64af61.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "64af61d8-56b5-4b55-ad9f-ca9d6597e07a",
-  "name": "repos_bitwiseman_github-api-test-autoinit",
-  "request": {
-    "url": "/repos/bitwiseman/github-api-test-autoinit",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api-test-autoinit\",\"has_issues\":\"false\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-64af61d8-56b5-4b55-ad9f-ca9d6597e07a.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4940",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"649cd4e87bcc94e6228df1418d0cdbf4\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE114:B8F15E:5D951935"
-    }
-  },
-  "uuid": "64af61d8-56b5-4b55-ad9f-ca9d6597e07a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2.json
new file mode 100644
index 0000000000..5c83ab705e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-2.json
@@ -0,0 +1,54 @@
+{
+  "id": "64af61d8-56b5-4b55-ad9f-ca9d6597e07a",
+  "name": "repos_bitwiseman_github-api-test-autoinit",
+  "request": {
+    "url": "/repos/bitwiseman/github-api-test-autoinit",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api-test-autoinit\",\"has_issues\":\"false\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-2.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4940",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"649cd4e87bcc94e6228df1418d0cdbf4\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE114:B8F15E:5D951935"
+    }
+  },
+  "uuid": "64af61d8-56b5-4b55-ad9f-ca9d6597e07a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3-a1a05f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3-a1a05f.json
deleted file mode 100644
index f9b6144c92..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3-a1a05f.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "a1a05f8b-7bd8-4200-a587-fd99f720508b",
-  "name": "repos_bitwiseman_github-api-test-autoinit",
-  "request": {
-    "url": "/repos/bitwiseman/github-api-test-autoinit",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"has_downloads\":\"false\",\"name\":\"github-api-test-autoinit\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-a1a05f8b-7bd8-4200-a587-fd99f720508b.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4939",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a4ffd953902dd8f9ea3b8d61f5d2d61\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE12E:B8F194:5D951935"
-    }
-  },
-  "uuid": "a1a05f8b-7bd8-4200-a587-fd99f720508b",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3.json
new file mode 100644
index 0000000000..b8e06b3e05
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-3.json
@@ -0,0 +1,54 @@
+{
+  "id": "a1a05f8b-7bd8-4200-a587-fd99f720508b",
+  "name": "repos_bitwiseman_github-api-test-autoinit",
+  "request": {
+    "url": "/repos/bitwiseman/github-api-test-autoinit",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"has_downloads\":\"false\",\"name\":\"github-api-test-autoinit\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-3.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4939",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a4ffd953902dd8f9ea3b8d61f5d2d61\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE12E:B8F194:5D951935"
+    }
+  },
+  "uuid": "a1a05f8b-7bd8-4200-a587-fd99f720508b",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4-c71176.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4-c71176.json
deleted file mode 100644
index f2fd23f82c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4-c71176.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "c71176ad-bfc9-4e39-aed8-6c4abd1c5979",
-  "name": "repos_bitwiseman_github-api-test-autoinit",
-  "request": {
-    "url": "/repos/bitwiseman/github-api-test-autoinit",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"has_wiki\":\"false\",\"name\":\"github-api-test-autoinit\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-c71176ad-bfc9-4e39-aed8-6c4abd1c5979.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4938",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3172b6b858bfe3dee02f80d5e8fd7b1a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE150:B8F1B6:5D951935"
-    }
-  },
-  "uuid": "c71176ad-bfc9-4e39-aed8-6c4abd1c5979",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4.json
new file mode 100644
index 0000000000..c8b127bb66
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "c71176ad-bfc9-4e39-aed8-6c4abd1c5979",
+  "name": "repos_bitwiseman_github-api-test-autoinit",
+  "request": {
+    "url": "/repos/bitwiseman/github-api-test-autoinit",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"has_wiki\":\"false\",\"name\":\"github-api-test-autoinit\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-4.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4938",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3172b6b858bfe3dee02f80d5e8fd7b1a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE150:B8F1B6:5D951935"
+    }
+  },
+  "uuid": "c71176ad-bfc9-4e39-aed8-6c4abd1c5979",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7-51dabc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7-51dabc.json
deleted file mode 100644
index a3a8a7b145..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7-51dabc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "51dabcc5-7825-4251-b560-8927ffa265b5",
-  "name": "repos_bitwiseman_github-api-test-autoinit",
-  "request": {
-    "url": "/repos/bitwiseman/github-api-test-autoinit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-51dabcc5-7825-4251-b560-8927ffa265b5.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4935",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3172b6b858bfe3dee02f80d5e8fd7b1a\"",
-      "Last-Modified": "Wed, 02 Oct 2019 21:40:07 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE3B2:B8F482:5D95193B"
-    }
-  },
-  "uuid": "51dabcc5-7825-4251-b560-8927ffa265b5",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7.json
new file mode 100644
index 0000000000..b8200a4091
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "51dabcc5-7825-4251-b560-8927ffa265b5",
+  "name": "repos_bitwiseman_github-api-test-autoinit",
+  "request": {
+    "url": "/repos/bitwiseman/github-api-test-autoinit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit-7.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4935",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3172b6b858bfe3dee02f80d5e8fd7b1a\"",
+      "Last-Modified": "Wed, 02 Oct 2019 21:40:07 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE3B2:B8F482:5D95193B"
+    }
+  },
+  "uuid": "51dabcc5-7825-4251-b560-8927ffa265b5",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-8-42bbd1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-8-42bbd1.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5-459f37.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5-459f37.json
deleted file mode 100644
index be4d428c3a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5-459f37.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "459f3734-bfaa-4f29-97fd-69574b66d965",
-  "name": "repos_bitwiseman_github-api-test-autoinit_readme",
-  "request": {
-    "url": "/repos/bitwiseman/github-api-test-autoinit/readme",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit_readme-459f3734-bfaa-4f29-97fd-69574b66d965.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4937",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d81305e069324d7186e8c5dcacc44a16\"",
-      "Last-Modified": "Wed, 02 Oct 2019 21:40:04 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE38C:B8F2D9:5D951938"
-    }
-  },
-  "uuid": "459f3734-bfaa-4f29-97fd-69574b66d965",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5.json
new file mode 100644
index 0000000000..607004b80a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/repos_bitwiseman_github-api-test-autoinit_readme-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "459f3734-bfaa-4f29-97fd-69574b66d965",
+  "name": "repos_bitwiseman_github-api-test-autoinit_readme",
+  "request": {
+    "url": "/repos/bitwiseman/github-api-test-autoinit/readme",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api-test-autoinit_readme-5.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4937",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d81305e069324d7186e8c5dcacc44a16\"",
+      "Last-Modified": "Wed, 02 Oct 2019 21:40:04 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE38C:B8F2D9:5D951938"
+    }
+  },
+  "uuid": "459f3734-bfaa-4f29-97fd-69574b66d965",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6-b16c3b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6-b16c3b.json
deleted file mode 100644
index 59f90d2e72..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6-b16c3b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b16c3b01-8cf2-4f90-a77a-f6ff9e371db0",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b16c3b01-8cf2-4f90-a77a-f6ff9e371db0.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE3A1:B8F46B:5D95193B"
-    }
-  },
-  "uuid": "b16c3b01-8cf2-4f90-a77a-f6ff9e371db0",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6.json
new file mode 100644
index 0000000000..823d1001f0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "b16c3b01-8cf2-4f90-a77a-f6ff9e371db0",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-6.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE3A1:B8F46B:5D95193B"
+    }
+  },
+  "uuid": "b16c3b01-8cf2-4f90-a77a-f6ff9e371db0",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1-7be481.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1-7be481.json
deleted file mode 100644
index b1cd759a50..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1-7be481.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "7be48128-4960-4274-8681-118897a274af",
-  "name": "user_repos",
-  "request": {
-    "url": "/user/repos",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"auto_init\":true,\"name\":\"github-api-test-autoinit\",\"description\":\"a test repository for auto init\",\"homepage\":\"http://github-api.kohsuke.org/\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "user_repos-7be48128-4960-4274-8681-118897a274af.json",
-    "headers": {
-      "Date": "Wed, 02 Oct 2019 21:40:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4941",
-      "X-RateLimit-Reset": "1570055937",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"dda2f2940b17089e5b65662a99c4651b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/bitwiseman/github-api-test-autoinit",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C2D6:361D:9BE05E:B8F09D:5D951934"
-    }
-  },
-  "uuid": "7be48128-4960-4274-8681-118897a274af",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1.json
new file mode 100644
index 0000000000..7428859a37
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRepositoryWithAutoInitializationCRUD/mappings/user_repos-1.json
@@ -0,0 +1,55 @@
+{
+  "id": "7be48128-4960-4274-8681-118897a274af",
+  "name": "user_repos",
+  "request": {
+    "url": "/user/repos",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"auto_init\":true,\"name\":\"github-api-test-autoinit\",\"description\":\"a test repository for auto init\",\"homepage\":\"http://github-api.kohsuke.org/\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "user_repos-1.json",
+    "headers": {
+      "Date": "Wed, 02 Oct 2019 21:40:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1570055937",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"dda2f2940b17089e5b65662a99c4651b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/bitwiseman/github-api-test-autoinit",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C2D6:361D:9BE05E:B8F09D:5D951934"
+    }
+  },
+  "uuid": "7be48128-4960-4274-8681-118897a274af",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/organizations_7544739_team_820406-8b1ba756-0fb7-49bf-8cd8-0febdccefd7e.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/organizations_7544739_team_820406-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/organizations_7544739_team_820406-8b1ba756-0fb7-49bf-8cd8-0febdccefd7e.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/organizations_7544739_team_820406-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org-84aa5465-24ab-43e3-9655-e835c39bfa65.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org-84aa5465-24ab-43e3-9655-e835c39bfa65.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org_teams-d833590f-9896-462c-846b-712b50377536.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org_teams-d833590f-9896-462c-846b-712b50377536.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/teams_820406-9302cc40-d07a-4ad2-b958-f035a849e3fb.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/teams_820406-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/teams_820406-9302cc40-d07a-4ad2-b958-f035a849e3fb.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/teams_820406-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/user-59e094cf-1ec5-49f3-a544-a434298717e4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/user-59e094cf-1ec5-49f3-a544-a434298717e4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7-8b1ba7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7-8b1ba7.json
deleted file mode 100644
index 7c0f4b2123..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7-8b1ba7.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "8b1ba756-0fb7-49bf-8cd8-0febdccefd7e",
-  "name": "organizations_7544739_team_820406",
-  "request": {
-    "url": "/organizations/7544739/team/820406",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_7544739_team_820406-8b1ba756-0fb7-49bf-8cd8-0febdccefd7e.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 10:16:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4906",
-      "X-RateLimit-Reset": "1584440312",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
-      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FC63:2DE2:1A9560A:3DC8D98:5E70A364"
-    }
-  },
-  "uuid": "8b1ba756-0fb7-49bf-8cd8-0febdccefd7e",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7.json
new file mode 100644
index 0000000000..e47e8e27ab
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_team_820406-7.json
@@ -0,0 +1,46 @@
+{
+  "id": "8b1ba756-0fb7-49bf-8cd8-0febdccefd7e",
+  "name": "organizations_7544739_team_820406",
+  "request": {
+    "url": "/organizations/7544739/team/820406",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_820406-7.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 10:16:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4906",
+      "X-RateLimit-Reset": "1584440312",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
+      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FC63:2DE2:1A9560A:3DC8D98:5E70A364"
+    }
+  },
+  "uuid": "8b1ba756-0fb7-49bf-8cd8-0febdccefd7e",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_teams_820406-6-20a951.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_teams_820406-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_teams_820406-6-20a951.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_7544739_teams_820406-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_github-api-test-org_teams_820406-5-e64007.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_github-api-test-org_teams_820406-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_github-api-test-org_teams_820406-5-e64007.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/organizations_github-api-test-org_teams_820406-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2-84aa54.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2-84aa54.json
deleted file mode 100644
index 63d44b6939..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2-84aa54.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "84aa5465-24ab-43e3-9655-e835c39bfa65",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-84aa5465-24ab-43e3-9655-e835c39bfa65.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 10:05:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4937",
-      "X-RateLimit-Reset": "1584440312",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d4203e09aeffc9b5325c2a5355275b5\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBBC:4FD5:1C7954:325E0B:5E70A0EA"
-    }
-  },
-  "uuid": "84aa5465-24ab-43e3-9655-e835c39bfa65",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..d59845be12
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "84aa5465-24ab-43e3-9655-e835c39bfa65",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 10:05:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4937",
+      "X-RateLimit-Reset": "1584440312",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d4203e09aeffc9b5325c2a5355275b5\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBBC:4FD5:1C7954:325E0B:5E70A0EA"
+    }
+  },
+  "uuid": "84aa5465-24ab-43e3-9655-e835c39bfa65",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3-d83359.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3-d83359.json
deleted file mode 100644
index d83d384eca..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3-d83359.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "d833590f-9896-462c-846b-712b50377536",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-d833590f-9896-462c-846b-712b50377536.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 10:05:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1584440312",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"54e42fc30d88d2a30340b56bbe54f211\"",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBBC:4FD5:1C7963:325E5F:5E70A0EC"
-    }
-  },
-  "uuid": "d833590f-9896-462c-846b-712b50377536",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..18b9dc64f4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "d833590f-9896-462c-846b-712b50377536",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 10:05:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1584440312",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"54e42fc30d88d2a30340b56bbe54f211\"",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBBC:4FD5:1C7963:325E5F:5E70A0EC"
+    }
+  },
+  "uuid": "d833590f-9896-462c-846b-712b50377536",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams_820406-4-e77527.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams_820406-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams_820406-4-e77527.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/orgs_github-api-test-org_teams_820406-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8-9302cc.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8-9302cc.json
deleted file mode 100644
index a4c14cf1de..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8-9302cc.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "9302cc40-d07a-4ad2-b958-f035a849e3fb",
-  "name": "teams_820406",
-  "request": {
-    "url": "/teams/820406",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_820406-9302cc40-d07a-4ad2-b958-f035a849e3fb.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 21:35:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1584484224",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
-      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
-      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA8E:731C:FD772:25F150:5E7142B3",
-      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/820406>; rel=\"alternate\""
-    }
-  },
-  "uuid": "9302cc40-d07a-4ad2-b958-f035a849e3fb",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8.json
new file mode 100644
index 0000000000..fe2a396494
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/teams_820406-8.json
@@ -0,0 +1,49 @@
+{
+  "id": "9302cc40-d07a-4ad2-b958-f035a849e3fb",
+  "name": "teams_820406",
+  "request": {
+    "url": "/teams/820406",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_820406-8.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 21:35:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1584484224",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
+      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
+      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA8E:731C:FD772:25F150:5E7142B3",
+      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/820406>; rel=\"alternate\""
+    }
+  },
+  "uuid": "9302cc40-d07a-4ad2-b958-f035a849e3fb",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1-59e094.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1-59e094.json
deleted file mode 100644
index 03eb5c98f9..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1-59e094.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "59e094cf-1ec5-49f3-a544-a434298717e4",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-59e094cf-1ec5-49f3-a544-a434298717e4.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 10:05:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4939",
-      "X-RateLimit-Reset": "1584440312",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
-      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBBC:4FD5:1C7910:325DFA:5E70A0EA"
-    }
-  },
-  "uuid": "59e094cf-1ec5-49f3-a544-a434298717e4",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1.json
new file mode 100644
index 0000000000..7332cdb11b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeam/mappings/user-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "59e094cf-1ec5-49f3-a544-a434298717e4",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 10:05:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4939",
+      "X-RateLimit-Reset": "1584440312",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
+      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBBC:4FD5:1C7910:325DFA:5E70A0EA"
+    }
+  },
+  "uuid": "59e094cf-1ec5-49f3-a544-a434298717e4",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/organizations_7544739_team_820406-ba773c31-6b20-4c65-9c67-e9fd89ea6bdd.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/organizations_7544739_team_820406-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/organizations_7544739_team_820406-ba773c31-6b20-4c65-9c67-e9fd89ea6bdd.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/organizations_7544739_team_820406-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org-1e6ccae5-0db6-47c0-89bc-5c1f2d862b63.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org-1e6ccae5-0db6-47c0-89bc-5c1f2d862b63.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org_teams-e2aa00b9-f24e-4650-8341-7f08ec5aea99.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org_teams-e2aa00b9-f24e-4650-8341-7f08ec5aea99.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/user-09eec5a0-4b1d-4afe-85d3-5413eb288548.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/user-09eec5a0-4b1d-4afe-85d3-5413eb288548.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4-ba773c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4-ba773c.json
deleted file mode 100644
index 6f46dc1ddd..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4-ba773c.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "ba773c31-6b20-4c65-9c67-e9fd89ea6bdd",
-  "name": "organizations_7544739_team_820406",
-  "request": {
-    "url": "/organizations/7544739/team/820406",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations_7544739_team_820406-ba773c31-6b20-4c65-9c67-e9fd89ea6bdd.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 21:36:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "1584484224",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
-      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA95:081B:10E156:25E8CE:5E7142DB"
-    }
-  },
-  "uuid": "ba773c31-6b20-4c65-9c67-e9fd89ea6bdd",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4.json
new file mode 100644
index 0000000000..14459bc237
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/organizations_7544739_team_820406-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "ba773c31-6b20-4c65-9c67-e9fd89ea6bdd",
+  "name": "organizations_7544739_team_820406",
+  "request": {
+    "url": "/organizations/7544739/team/820406",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_820406-4.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 21:36:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1584484224",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"1201d96396c062b2208db689dc6a3887\"",
+      "Last-Modified": "Sat, 10 May 2014 19:40:03 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA95:081B:10E156:25E8CE:5E7142DB"
+    }
+  },
+  "uuid": "ba773c31-6b20-4c65-9c67-e9fd89ea6bdd",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2-1e6cca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2-1e6cca.json
deleted file mode 100644
index 746cac5026..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2-1e6cca.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "1e6ccae5-0db6-47c0-89bc-5c1f2d862b63",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-1e6ccae5-0db6-47c0-89bc-5c1f2d862b63.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 21:36:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4988",
-      "X-RateLimit-Reset": "1584484223",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"3aa57f9a6ec0d8e1d1dfbcb665852c3a\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA95:081B:10E13F:25E832:5E7142DA"
-    }
-  },
-  "uuid": "1e6ccae5-0db6-47c0-89bc-5c1f2d862b63",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..c77fee7744
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "1e6ccae5-0db6-47c0-89bc-5c1f2d862b63",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 21:36:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1584484223",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"3aa57f9a6ec0d8e1d1dfbcb665852c3a\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA95:081B:10E13F:25E832:5E7142DA"
+    }
+  },
+  "uuid": "1e6ccae5-0db6-47c0-89bc-5c1f2d862b63",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3-e2aa00.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3-e2aa00.json
deleted file mode 100644
index 5e3489042d..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3-e2aa00.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "e2aa00b9-f24e-4650-8341-7f08ec5aea99",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-e2aa00b9-f24e-4650-8341-7f08ec5aea99.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 21:36:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "1584484223",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"54e42fc30d88d2a30340b56bbe54f211\"",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA95:081B:10E14F:25E8B9:5E7142DB"
-    }
-  },
-  "uuid": "e2aa00b9-f24e-4650-8341-7f08ec5aea99",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..b805609b88
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "e2aa00b9-f24e-4650-8341-7f08ec5aea99",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 21:36:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1584484223",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"54e42fc30d88d2a30340b56bbe54f211\"",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA95:081B:10E14F:25E8B9:5E7142DB"
+    }
+  },
+  "uuid": "e2aa00b9-f24e-4650-8341-7f08ec5aea99",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1-09eec5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1-09eec5.json
deleted file mode 100644
index a3cde0029b..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1-09eec5.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "09eec5a0-4b1d-4afe-85d3-5413eb288548",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-09eec5a0-4b1d-4afe-85d3-5413eb288548.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 21:36:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1584484223",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
-      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA95:081B:10E0FE:25E811:5E7142DA"
-    }
-  },
-  "uuid": "09eec5a0-4b1d-4afe-85d3-5413eb288548",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1.json
new file mode 100644
index 0000000000..6ba6738fbc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testShouldFetchTeamFromOrganization/mappings/user-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "09eec5a0-4b1d-4afe-85d3-5413eb288548",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 21:36:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1584484223",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
+      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA95:081B:10E0FE:25E811:5E7142DA"
+    }
+  },
+  "uuid": "09eec5a0-4b1d-4afe-85d3-5413eb288548",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api-809893de-22d7-4bad-9e0a-c7b9ff8ee7df.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api-809893de-22d7-4bad-9e0a-c7b9ff8ee7df.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api_subscribers-8cec4255-a7a6-484c-ab2f-5c2655d826c9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api_subscribers-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api_subscribers-8cec4255-a7a6-484c-ab2f-5c2655d826c9.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/repos_bitwiseman_github-api_subscribers-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user-9344f7a2-3c3a-427c-a70e-adaad303b0b4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user-9344f7a2-3c3a-427c-a70e-adaad303b0b4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-bd9bd719-ef4a-483d-b552-0d10fe05981b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-bd9bd719-ef4a-483d-b552-0d10fe05981b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-10.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-36527ce6-bfd4-43ca-b165-d12ee231b603.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-36527ce6-bfd4-43ca-b165-d12ee231b603.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-6.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-923eca2f-072a-4532-bbd2-7672e5a49011.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-923eca2f-072a-4532-bbd2-7672e5a49011.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-7.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-6e87f8e2-f745-47ab-884a-4a092e61d385.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-6e87f8e2-f745-47ab-884a-4a092e61d385.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-8.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-9bdd2b94-9737-4def-8b3a-33f8cbf79e20.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-9bdd2b94-9737-4def-8b3a-33f8cbf79e20.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/user_1958953_repos-9.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman-695b59f0-b7e7-4239-9389-39e71b040233.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman-695b59f0-b7e7-4239-9389-39e71b040233.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman_repos-2be0523d-30fd-42bc-94d1-95926ee70069.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman_repos-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman_repos-2be0523d-30fd-42bc-94d1-95926ee70069.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/__files/users_bitwiseman_repos-5.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2-809893.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2-809893.json
deleted file mode 100644
index 6e4b6b1a1c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2-809893.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "809893de-22d7-4bad-9e0a-c7b9ff8ee7df",
-  "name": "repos_bitwiseman_github-api",
-  "request": {
-    "url": "/repos/bitwiseman/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api-809893de-22d7-4bad-9e0a-c7b9ff8ee7df.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4347",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"655235f9d6e8d2392b20b2ddaca630f8\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:51:28 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C1447C:DF0F2D:5DB3A13C"
-    }
-  },
-  "uuid": "809893de-22d7-4bad-9e0a-c7b9ff8ee7df",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2.json
new file mode 100644
index 0000000000..7735b11f7f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "809893de-22d7-4bad-9e0a-c7b9ff8ee7df",
+  "name": "repos_bitwiseman_github-api",
+  "request": {
+    "url": "/repos/bitwiseman/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4347",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"655235f9d6e8d2392b20b2ddaca630f8\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:51:28 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C1447C:DF0F2D:5DB3A13C"
+    }
+  },
+  "uuid": "809893de-22d7-4bad-9e0a-c7b9ff8ee7df",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3-8cec42.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3-8cec42.json
deleted file mode 100644
index ac66c65d63..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3-8cec42.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "8cec4255-a7a6-484c-ab2f-5c2655d826c9",
-  "name": "repos_bitwiseman_github-api_subscribers",
-  "request": {
-    "url": "/repos/bitwiseman/github-api/subscribers",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_github-api_subscribers-8cec4255-a7a6-484c-ab2f-5c2655d826c9.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4346",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"024a80cc64f9dff85ca2952c62eff850\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C14489:DF0F44:5DB3A13D"
-    }
-  },
-  "uuid": "8cec4255-a7a6-484c-ab2f-5c2655d826c9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3.json
new file mode 100644
index 0000000000..ec06049e7c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/repos_bitwiseman_github-api_subscribers-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "8cec4255-a7a6-484c-ab2f-5c2655d826c9",
+  "name": "repos_bitwiseman_github-api_subscribers",
+  "request": {
+    "url": "/repos/bitwiseman/github-api/subscribers",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_github-api_subscribers-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4346",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"024a80cc64f9dff85ca2952c62eff850\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C14489:DF0F44:5DB3A13D"
+    }
+  },
+  "uuid": "8cec4255-a7a6-484c-ab2f-5c2655d826c9",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1-9344f7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1-9344f7.json
deleted file mode 100644
index 4d26ce2ec3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1-9344f7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9344f7a2-3c3a-427c-a70e-adaad303b0b4",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9344f7a2-3c3a-427c-a70e-adaad303b0b4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4349",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C14467:DF0F20:5DB3A13C"
-    }
-  },
-  "uuid": "9344f7a2-3c3a-427c-a70e-adaad303b0b4",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1.json
new file mode 100644
index 0000000000..6c36d7f23e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "9344f7a2-3c3a-427c-a70e-adaad303b0b4",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4349",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C14467:DF0F20:5DB3A13C"
+    }
+  },
+  "uuid": "9344f7a2-3c3a-427c-a70e-adaad303b0b4",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10-bd9bd7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10-bd9bd7.json
deleted file mode 100644
index 7b644542a1..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10-bd9bd7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bd9bd719-ef4a-483d-b552-0d10fe05981b",
-  "name": "user_1958953_repos",
-  "request": {
-    "url": "/user/1958953/repos?per_page=30&page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_1958953_repos-bd9bd719-ef4a-483d-b552-0d10fe05981b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4339",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cb5a751aac948da2de969ba5f91759d9\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C1452F:DF1004:5DB3A13F",
-      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=5>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "bd9bd719-ef4a-483d-b552-0d10fe05981b",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10.json
new file mode 100644
index 0000000000..8484cb8b50
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "bd9bd719-ef4a-483d-b552-0d10fe05981b",
+  "name": "user_1958953_repos",
+  "request": {
+    "url": "/user/1958953/repos?per_page=30&page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_1958953_repos-10.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4339",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cb5a751aac948da2de969ba5f91759d9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C1452F:DF1004:5DB3A13F",
+      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=5>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "bd9bd719-ef4a-483d-b552-0d10fe05981b",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6-36527c.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6-36527c.json
deleted file mode 100644
index 52d11ef486..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6-36527c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "36527ce6-bfd4-43ca-b165-d12ee231b603",
-  "name": "user_1958953_repos",
-  "request": {
-    "url": "/user/1958953/repos?per_page=30&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_1958953_repos-36527ce6-bfd4-43ca-b165-d12ee231b603.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4343",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"20c491d7768ff07c9cddf1d79a530fd0\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C144B2:DF0F7C:5DB3A13D",
-      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=3>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "36527ce6-bfd4-43ca-b165-d12ee231b603",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6.json
new file mode 100644
index 0000000000..852567fae3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "36527ce6-bfd4-43ca-b165-d12ee231b603",
+  "name": "user_1958953_repos",
+  "request": {
+    "url": "/user/1958953/repos?per_page=30&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_1958953_repos-6.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4343",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"20c491d7768ff07c9cddf1d79a530fd0\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C144B2:DF0F7C:5DB3A13D",
+      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=3>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "36527ce6-bfd4-43ca-b165-d12ee231b603",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7-923eca.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7-923eca.json
deleted file mode 100644
index 1d4a955e53..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7-923eca.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "923eca2f-072a-4532-bbd2-7672e5a49011",
-  "name": "user_1958953_repos",
-  "request": {
-    "url": "/user/1958953/repos?per_page=30&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_1958953_repos-923eca2f-072a-4532-bbd2-7672e5a49011.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4342",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7b038bd8ad2e09c61f73f91659b4a36a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C144DC:DF0FAD:5DB3A13E",
-      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=2>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=4>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "923eca2f-072a-4532-bbd2-7672e5a49011",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7.json
new file mode 100644
index 0000000000..fabb831d8c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "923eca2f-072a-4532-bbd2-7672e5a49011",
+  "name": "user_1958953_repos",
+  "request": {
+    "url": "/user/1958953/repos?per_page=30&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_1958953_repos-7.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4342",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7b038bd8ad2e09c61f73f91659b4a36a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C144DC:DF0FAD:5DB3A13E",
+      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=2>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=4>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "923eca2f-072a-4532-bbd2-7672e5a49011",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8-6e87f8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8-6e87f8.json
deleted file mode 100644
index b35e522a0f..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8-6e87f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6e87f8e2-f745-47ab-884a-4a092e61d385",
-  "name": "user_1958953_repos",
-  "request": {
-    "url": "/user/1958953/repos?per_page=30&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_1958953_repos-6e87f8e2-f745-47ab-884a-4a092e61d385.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4341",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ab9d0a4ea7813c01bd900275b21db790\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C144F5:DF0FC5:5DB3A13E",
-      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=3>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=5>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6e87f8e2-f745-47ab-884a-4a092e61d385",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8.json
new file mode 100644
index 0000000000..c1367880ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "6e87f8e2-f745-47ab-884a-4a092e61d385",
+  "name": "user_1958953_repos",
+  "request": {
+    "url": "/user/1958953/repos?per_page=30&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_1958953_repos-8.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4341",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ab9d0a4ea7813c01bd900275b21db790\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C144F5:DF0FC5:5DB3A13E",
+      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=3>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=5>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6e87f8e2-f745-47ab-884a-4a092e61d385",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9-9bdd2b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9-9bdd2b.json
deleted file mode 100644
index 6bac5a81d3..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9-9bdd2b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9bdd2b94-9737-4def-8b3a-33f8cbf79e20",
-  "name": "user_1958953_repos",
-  "request": {
-    "url": "/user/1958953/repos?per_page=30&page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_1958953_repos-9bdd2b94-9737-4def-8b3a-33f8cbf79e20.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4340",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"20709622757917bd2a23dc6c7871ef55\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C14513:DF0FE9:5DB3A13E",
-      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=4>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "9bdd2b94-9737-4def-8b3a-33f8cbf79e20",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9.json
new file mode 100644
index 0000000000..c59158b2c3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/user_1958953_repos-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "9bdd2b94-9737-4def-8b3a-33f8cbf79e20",
+  "name": "user_1958953_repos",
+  "request": {
+    "url": "/user/1958953/repos?per_page=30&page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_1958953_repos-9.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4340",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"20709622757917bd2a23dc6c7871ef55\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C14513:DF0FE9:5DB3A13E",
+      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=4>; rel=\"prev\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\", <https://api.github.com/user/1958953/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "9bdd2b94-9737-4def-8b3a-33f8cbf79e20",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4-695b59.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4-695b59.json
deleted file mode 100644
index 026e978083..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4-695b59.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "695b59f0-b7e7-4239-9389-39e71b040233",
-  "name": "users_bitwiseman",
-  "request": {
-    "url": "/users/bitwiseman",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_bitwiseman-695b59f0-b7e7-4239-9389-39e71b040233.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4345",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C14490:DF0F50:5DB3A13D"
-    }
-  },
-  "uuid": "695b59f0-b7e7-4239-9389-39e71b040233",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4.json
new file mode 100644
index 0000000000..9412dd6f5b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "695b59f0-b7e7-4239-9389-39e71b040233",
+  "name": "users_bitwiseman",
+  "request": {
+    "url": "/users/bitwiseman",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_bitwiseman-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4345",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C14490:DF0F50:5DB3A13D"
+    }
+  },
+  "uuid": "695b59f0-b7e7-4239-9389-39e71b040233",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5-2be052.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5-2be052.json
deleted file mode 100644
index 7d9199b899..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5-2be052.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2be0523d-30fd-42bc-94d1-95926ee70069",
-  "name": "users_bitwiseman_repos",
-  "request": {
-    "url": "/users/bitwiseman/repos?per_page=30",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_bitwiseman_repos-2be0523d-30fd-42bc-94d1-95926ee70069.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4344",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ce2fe41fb7c2c62f68beb3d08dc52aa8\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAD5:45A4:C1449C:DF0F5A:5DB3A13D",
-      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=2>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\""
-    }
-  },
-  "uuid": "2be0523d-30fd-42bc-94d1-95926ee70069",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5.json
new file mode 100644
index 0000000000..8bbcdba55b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testSubscribers/mappings/users_bitwiseman_repos-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "2be0523d-30fd-42bc-94d1-95926ee70069",
+  "name": "users_bitwiseman_repos",
+  "request": {
+    "url": "/users/bitwiseman/repos?per_page=30",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_bitwiseman_repos-5.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4344",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ce2fe41fb7c2c62f68beb3d08dc52aa8\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAD5:45A4:C1449C:DF0F5A:5DB3A13D",
+      "Link": "<https://api.github.com/user/1958953/repos?per_page=30&page=2>; rel=\"next\", <https://api.github.com/user/1958953/repos?per_page=30&page=6>; rel=\"last\""
+    }
+  },
+  "uuid": "2be0523d-30fd-42bc-94d1-95926ee70069",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/user-ce7a016c-62a1-48c6-98c9-5638aaff0074.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/user-ce7a016c-62a1-48c6-98c9-5638aaff0074.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2-1c232f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2-1c232f.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3-ffd3e3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3-ffd3e3.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/repos_github-api_github-api_git_trees_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1-ce7a01.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1-ce7a01.json
deleted file mode 100644
index 0645312eef..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1-ce7a01.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ce7a016c-62a1-48c6-98c9-5638aaff0074",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ce7a016c-62a1-48c6-98c9-5638aaff0074.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4464",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CA72:5F2B:EE2A6A:1186B7A:5DB3A0E7"
-    }
-  },
-  "uuid": "ce7a016c-62a1-48c6-98c9-5638aaff0074",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1.json
new file mode 100644
index 0000000000..4c75b48aad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testTreesRecursive/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "ce7a016c-62a1-48c6-98c9-5638aaff0074",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4464",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CA72:5F2B:EE2A6A:1186B7A:5DB3A0E7"
+    }
+  },
+  "uuid": "ce7a016c-62a1-48c6-98c9-5638aaff0074",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/__files/user-813f6f5e-3561-4743-ae0c-ff932c012445.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/__files/user-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/__files/user-813f6f5e-3561-4743-ae0c-ff932c012445.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/__files/user-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2-813f6f.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2-813f6f.json
deleted file mode 100644
index c906e3a361..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2-813f6f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "813f6f5e-3561-4743-ae0c-ff932c012445",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-813f6f5e-3561-4743-ae0c-ff932c012445.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4310",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAED:8340:ED1DEC:116F78B:5DB3A144"
-    }
-  },
-  "uuid": "813f6f5e-3561-4743-ae0c-ff932c012445",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2.json
new file mode 100644
index 0000000000..39bbfb60db
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/user-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "813f6f5e-3561-4743-ae0c-ff932c012445",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4310",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAED:8340:ED1DEC:116F78B:5DB3A144"
+    }
+  },
+  "uuid": "813f6f5e-3561-4743-ae0c-ff932c012445",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/users_bitwiseman_orgs-1-94ce73.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/users_bitwiseman_orgs-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/users_bitwiseman_orgs-1-94ce73.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreNone/mappings/users_bitwiseman_orgs-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/user-cb0c811c-52d4-4d1c-878a-2f1c73417d2b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/user-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/user-cb0c811c-52d4-4d1c-878a-2f1c73417d2b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/user-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/users_kohsuke_orgs-7ef9c5df-d48e-44be-ba15-e880b8e9558d.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/users_kohsuke_orgs-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/users_kohsuke_orgs-7ef9c5df-d48e-44be-ba15-e880b8e9558d.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/__files/users_kohsuke_orgs-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2-cb0c81.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2-cb0c81.json
deleted file mode 100644
index 1d564bbcca..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2-cb0c81.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cb0c811c-52d4-4d1c-878a-2f1c73417d2b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-cb0c811c-52d4-4d1c-878a-2f1c73417d2b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4308",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:5F2A:B8D6D8:D6E3EB:5DB3A145"
-    }
-  },
-  "uuid": "cb0c811c-52d4-4d1c-878a-2f1c73417d2b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2.json
new file mode 100644
index 0000000000..99e467cd41
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/user-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "cb0c811c-52d4-4d1c-878a-2f1c73417d2b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4308",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF1:5F2A:B8D6D8:D6E3EB:5DB3A145"
+    }
+  },
+  "uuid": "cb0c811c-52d4-4d1c-878a-2f1c73417d2b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1-7ef9c5.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1-7ef9c5.json
deleted file mode 100644
index 54439bf60c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1-7ef9c5.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "id": "7ef9c5df-d48e-44be-ba15-e880b8e9558d",
-  "name": "users_kohsuke_orgs",
-  "request": {
-    "url": "/users/kohsuke/orgs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke_orgs-7ef9c5df-d48e-44be-ba15-e880b8e9558d.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Thu, 24 Oct 2019 15:50:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "25",
-      "X-RateLimit-Reset": "1571934805",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": "Accept",
-      "ETag": "W/\"5c5a7fc59f333fbeda60ffeefc546a8a\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "5EE8:1F70:C0C53:1D07EC:5DB1C82C"
-    }
-  },
-  "uuid": "7ef9c5df-d48e-44be-ba15-e880b8e9558d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1.json
new file mode 100644
index 0000000000..8537cd19bc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testUserPublicOrganizationsWhenThereAreSome/mappings/users_kohsuke_orgs-1.json
@@ -0,0 +1,42 @@
+{
+  "id": "7ef9c5df-d48e-44be-ba15-e880b8e9558d",
+  "name": "users_kohsuke_orgs",
+  "request": {
+    "url": "/users/kohsuke/orgs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke_orgs-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Thu, 24 Oct 2019 15:50:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "25",
+      "X-RateLimit-Reset": "1571934805",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": "Accept",
+      "ETag": "W/\"5c5a7fc59f333fbeda60ffeefc546a8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "5EE8:1F70:C0C53:1D07EC:5DB1C82C"
+    }
+  },
+  "uuid": "7ef9c5df-d48e-44be-ba15-e880b8e9558d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/orgs_github-api-test-org-4eb6084c-7fa6-4d71-a94a-05b226ecf53b.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/orgs_github-api-test-org-4eb6084c-7fa6-4d71-a94a-05b226ecf53b.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api-6eeaa8d2-6df3-4957-85d6-c2a5abe89738.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api-6eeaa8d2-6df3-4957-85d6-c2a5abe89738.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api_hooks-bd2a1759-9f96-4bba-a29c-1c7548d113e4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api_hooks-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api_hooks-bd2a1759-9f96-4bba-a29c-1c7548d113e4.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/repos_github-api-test-org_github-api_hooks-4.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/user-3d7769c0-aae6-4946-b6d9-9e2152c52f00.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/user-3d7769c0-aae6-4946-b6d9-9e2152c52f00.json
rename to src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2-4eb608.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2-4eb608.json
deleted file mode 100644
index 556686b1a5..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2-4eb608.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4eb6084c-7fa6-4d71-a94a-05b226ecf53b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4eb6084c-7fa6-4d71-a94a-05b226ecf53b.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4405",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAB0:1CC2:1A2144:1EF048:5DB3A10F"
-    }
-  },
-  "uuid": "4eb6084c-7fa6-4d71-a94a-05b226ecf53b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..e31ec4726f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4eb6084c-7fa6-4d71-a94a-05b226ecf53b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4405",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAB0:1CC2:1A2144:1EF048:5DB3A10F"
+    }
+  },
+  "uuid": "4eb6084c-7fa6-4d71-a94a-05b226ecf53b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3-6eeaa8.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3-6eeaa8.json
deleted file mode 100644
index f3381d312c..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3-6eeaa8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6eeaa8d2-6df3-4957-85d6-c2a5abe89738",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6eeaa8d2-6df3-4957-85d6-c2a5abe89738.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4404",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9bc574c14028f51f37bccc2ff9819c25\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAB0:1CC2:1A214B:1EF051:5DB3A110"
-    }
-  },
-  "uuid": "6eeaa8d2-6df3-4957-85d6-c2a5abe89738",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..356c018735
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6eeaa8d2-6df3-4957-85d6-c2a5abe89738",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4404",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9bc574c14028f51f37bccc2ff9819c25\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAB0:1CC2:1A214B:1EF051:5DB3A110"
+    }
+  },
+  "uuid": "6eeaa8d2-6df3-4957-85d6-c2a5abe89738",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4-bd2a17.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4-bd2a17.json
deleted file mode 100644
index e64a0a5cb6..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4-bd2a17.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "bd2a1759-9f96-4bba-a29c-1c7548d113e4",
-  "name": "repos_github-api-test-org_github-api_hooks",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/hooks",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"web\",\"active\":true,\"config\":{\"url\":\"http://www.google.com/\"}}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_hooks-bd2a1759-9f96-4bba-a29c-1c7548d113e4.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4403",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"d8f03beb9a12fb632468ce3ba0e41bc6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:repo_hook, public_repo, repo, write:repo_hook",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/hooks/152229630",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAB0:1CC2:1A214E:1EF057:5DB3A110"
-    }
-  },
-  "uuid": "bd2a1759-9f96-4bba-a29c-1c7548d113e4",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4.json
new file mode 100644
index 0000000000..7642dee714
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/repos_github-api-test-org_github-api_hooks-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "bd2a1759-9f96-4bba-a29c-1c7548d113e4",
+  "name": "repos_github-api-test-org_github-api_hooks",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/hooks",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"web\",\"active\":true,\"config\":{\"url\":\"http://www.google.com/\"}}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_hooks-4.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4403",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d8f03beb9a12fb632468ce3ba0e41bc6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:repo_hook, public_repo, repo, write:repo_hook",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/hooks/152229630",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAB0:1CC2:1A214E:1EF057:5DB3A110"
+    }
+  },
+  "uuid": "bd2a1759-9f96-4bba-a29c-1c7548d113e4",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1-3d7769.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1-3d7769.json
deleted file mode 100644
index 458d7ce55a..0000000000
--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1-3d7769.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3d7769c0-aae6-4946-b6d9-9e2152c52f00",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3d7769c0-aae6-4946-b6d9-9e2152c52f00.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:27:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4407",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAB0:1CC2:1A213E:1EF045:5DB3A10F"
-    }
-  },
-  "uuid": "3d7769c0-aae6-4946-b6d9-9e2152c52f00",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1.json b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1.json
new file mode 100644
index 0000000000..61b248efaa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/tryHook/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "3d7769c0-aae6-4946-b6d9-9e2152c52f00",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:27:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4407",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAB0:1CC2:1A213E:1EF045:5DB3A10F"
+    }
+  },
+  "uuid": "3d7769c0-aae6-4946-b6d9-9e2152c52f00",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler-9019ab15-9d4d-46d6-a771-c22b3a2a9d49.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler-9019ab15-9d4d-46d6-a771-c22b3a2a9d49.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler-2.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits-0d3401ed-a2b4-4de3-82d6-9b95b5341a34.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits-0d3401ed-a2b4-4de3-82d6-9b95b5341a34.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits-3.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-56b0eac8-fa5b-45fa-8ca9-b4fc279933a8.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-56b0eac8-fa5b-45fa-8ca9-b4fc279933a8.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-e14c2b7e-97c5-4209-b548-c90e00d7a6b9.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-e14c2b7e-97c5-4209-b548-c90e00d7a6b9.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-c380c36d-bac3-4be8-8b4f-8693388d7553.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-c380c36d-bac3-4be8-8b4f-8693388d7553.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-670b6d74-d1be-4679-8905-94d63b5ee87e.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-670b6d74-d1be-4679-8905-94d63b5ee87e.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-5d4638f0-0b7d-4298-93fb-1f563afa687c.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-5d4638f0-0b7d-4298-93fb-1f563afa687c.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-f3ed2248-279a-4998-86cf-210ed1262fe7.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-f3ed2248-279a-4998-86cf-210ed1262fe7.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-e6d566ed-eebd-42d8-86a0-16f113054b3e.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-e6d566ed-eebd-42d8-86a0-16f113054b3e.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-8aea2962-4bf2-41cd-8137-49b1e6c1e9bb.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-8aea2962-4bf2-41cd-8137-49b1e6c1e9bb.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/user-5ed62e6e-2e24-40bf-a0ef-ed960a7ad354.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/user-5ed62e6e-2e24-40bf-a0ef-ed960a7ad354.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2-9019ab.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2-9019ab.json
deleted file mode 100644
index 507def4a57..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2-9019ab.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9019ab15-9d4d-46d6-a771-c22b3a2a9d49",
-  "name": "repos_stapler_stapler",
-  "request": {
-    "url": "/repos/stapler/stapler",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler-9019ab15-9d4d-46d6-a771-c22b3a2a9d49.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:52 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4977",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"8c92941e967261209c3138e302e84803\"",
-      "Last-Modified": "Wed, 19 Feb 2020 13:17:37 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:34793E0:3E24606:5E6A992B"
-    }
-  },
-  "uuid": "9019ab15-9d4d-46d6-a771-c22b3a2a9d49",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2.json
new file mode 100644
index 0000000000..e45f570f3a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "9019ab15-9d4d-46d6-a771-c22b3a2a9d49",
+  "name": "repos_stapler_stapler",
+  "request": {
+    "url": "/repos/stapler/stapler",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler-2.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:52 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4977",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"8c92941e967261209c3138e302e84803\"",
+      "Last-Modified": "Wed, 19 Feb 2020 13:17:37 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:34793E0:3E24606:5E6A992B"
+    }
+  },
+  "uuid": "9019ab15-9d4d-46d6-a771-c22b3a2a9d49",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3-0d3401.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3-0d3401.json
deleted file mode 100644
index 2e75ddb38c..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3-0d3401.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "0d3401ed-a2b4-4de3-82d6-9b95b5341a34",
-  "name": "repos_stapler_stapler_commits",
-  "request": {
-    "url": "/repos/stapler/stapler/commits?path=pom.xml",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits-0d3401ed-a2b4-4de3-82d6-9b95b5341a34.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"5e6710930559545e00a5979afac3f866\"",
-      "Last-Modified": "Mon, 10 Feb 2020 20:17:31 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479484:3E247ED:5E6A992C",
-      "Link": "<https://api.github.com/repositories/1548514/commits?path=pom.xml&page=2>; rel=\"next\", <https://api.github.com/repositories/1548514/commits?path=pom.xml&page=14>; rel=\"last\""
-    }
-  },
-  "uuid": "0d3401ed-a2b4-4de3-82d6-9b95b5341a34",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3.json
new file mode 100644
index 0000000000..2a73fe5d4d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "0d3401ed-a2b4-4de3-82d6-9b95b5341a34",
+  "name": "repos_stapler_stapler_commits",
+  "request": {
+    "url": "/repos/stapler/stapler/commits?path=pom.xml",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits-3.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4976",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"5e6710930559545e00a5979afac3f866\"",
+      "Last-Modified": "Mon, 10 Feb 2020 20:17:31 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479484:3E247ED:5E6A992C",
+      "Link": "<https://api.github.com/repositories/1548514/commits?path=pom.xml&page=2>; rel=\"next\", <https://api.github.com/repositories/1548514/commits?path=pom.xml&page=14>; rel=\"last\""
+    }
+  },
+  "uuid": "0d3401ed-a2b4-4de3-82d6-9b95b5341a34",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-56b0ea.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-56b0ea.json
deleted file mode 100644
index b35563558c..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-56b0ea.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "56b0eac8-fa5b-45fa-8ca9-b4fc279933a8",
-  "name": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-56b0eac8-fa5b-45fa-8ca9-b4fc279933a8.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"4dc7cf084c55f00fdc620bcfd6467706\"",
-      "Last-Modified": "Mon, 19 Aug 2019 17:42:58 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:34799B6:3E24D60:5E6A992F"
-    }
-  },
-  "uuid": "56b0eac8-fa5b-45fa-8ca9-b4fc279933a8",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
new file mode 100644
index 0000000000..8efffdba74
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "56b0eac8-fa5b-45fa-8ca9-b4fc279933a8",
+  "name": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"4dc7cf084c55f00fdc620bcfd6467706\"",
+      "Last-Modified": "Mon, 19 Aug 2019 17:42:58 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:34799B6:3E24D60:5E6A992F"
+    }
+  },
+  "uuid": "56b0eac8-fa5b-45fa-8ca9-b4fc279933a8",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9-a01b5c.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9-a01b5c.json
deleted file mode 100644
index a66e2bf3ad..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9-a01b5c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38",
-  "name": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1584045523",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"7b1dfd787be1d37e7597235f96ebcf39\"",
-      "Last-Modified": "Fri, 28 Jun 2019 16:21:18 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479A0D:3E24EB9:5E6A992F"
-    }
-  },
-  "uuid": "a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json
new file mode 100644
index 0000000000..cfab1574ec
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38",
+  "name": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-9.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1584045523",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"7b1dfd787be1d37e7597235f96ebcf39\"",
+      "Last-Modified": "Fri, 28 Jun 2019 16:21:18 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479A0D:3E24EB9:5E6A992F"
+    }
+  },
+  "uuid": "a01b5cee-d3ea-449b-9b11-5fd3c2a7ed38",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10-e14c2b.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10-e14c2b.json
deleted file mode 100644
index d078b1e351..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10-e14c2b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e14c2b7e-97c5-4209-b548-c90e00d7a6b9",
-  "name": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-e14c2b7e-97c5-4209-b548-c90e00d7a6b9.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4969",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"7c98080280f560351575016b525b675b\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:19:21 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479A83:3E24F51:5E6A9930"
-    }
-  },
-  "uuid": "e14c2b7e-97c5-4209-b548-c90e00d7a6b9",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json
new file mode 100644
index 0000000000..a700897666
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "e14c2b7e-97c5-4209-b548-c90e00d7a6b9",
+  "name": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-10.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4969",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"7c98080280f560351575016b525b675b\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:19:21 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479A83:3E24F51:5E6A9930"
+    }
+  },
+  "uuid": "e14c2b7e-97c5-4209-b548-c90e00d7a6b9",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13-c380c3.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13-c380c3.json
deleted file mode 100644
index 15597a7ec9..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13-c380c3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c380c36d-bac3-4be8-8b4f-8693388d7553",
-  "name": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-c380c36d-bac3-4be8-8b4f-8693388d7553.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1584045523",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"199e6b1eb2af3cae42fb379f1ac0b122\"",
-      "Last-Modified": "Wed, 03 Apr 2019 19:03:54 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479C11:3E25139:5E6A9931"
-    }
-  },
-  "uuid": "c380c36d-bac3-4be8-8b4f-8693388d7553",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json
new file mode 100644
index 0000000000..69f774f04c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "c380c36d-bac3-4be8-8b4f-8693388d7553",
+  "name": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-13.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1584045523",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"199e6b1eb2af3cae42fb379f1ac0b122\"",
+      "Last-Modified": "Wed, 03 Apr 2019 19:03:54 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479C11:3E25139:5E6A9931"
+    }
+  },
+  "uuid": "c380c36d-bac3-4be8-8b4f-8693388d7553",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-4c38e9.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-4c38e9.json
deleted file mode 100644
index 85b42fa6e3..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-4c38e9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7",
-  "name": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/6a243869aa3c3f80579102d00848a0083953d654",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1584045523",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"4c76c203b89528b04df353267085e6f1\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:42 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479873:3E24CD6:5E6A992E"
-    }
-  },
-  "uuid": "4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
new file mode 100644
index 0000000000..4a8495bc05
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7",
+  "name": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/6a243869aa3c3f80579102d00848a0083953d654",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1584045523",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"4c76c203b89528b04df353267085e6f1\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:42 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479873:3E24CD6:5E6A992E"
+    }
+  },
+  "uuid": "4c38e9f4-b60e-4b6b-b35f-ba3a7a358ff7",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6-670b6d.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6-670b6d.json
deleted file mode 100644
index e7481c7b51..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6-670b6d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "670b6d74-d1be-4679-8905-94d63b5ee87e",
-  "name": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/950acbd60ed4289520dcd2a395e5d77f181e1cff",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-670b6d74-d1be-4679-8905-94d63b5ee87e.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9e93eeea59a8052630e82bf77a3522e6\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:34797FC:3E24B33:5E6A992D"
-    }
-  },
-  "uuid": "670b6d74-d1be-4679-8905-94d63b5ee87e",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json
new file mode 100644
index 0000000000..2bc3047052
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "670b6d74-d1be-4679-8905-94d63b5ee87e",
+  "name": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/950acbd60ed4289520dcd2a395e5d77f181e1cff",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-6.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9e93eeea59a8052630e82bf77a3522e6\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:34797FC:3E24B33:5E6A992D"
+    }
+  },
+  "uuid": "670b6d74-d1be-4679-8905-94d63b5ee87e",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4-5d4638.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4-5d4638.json
deleted file mode 100644
index c15059363a..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4-5d4638.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5d4638f0-0b7d-4298-93fb-1f563afa687c",
-  "name": "repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/c8c28eb749937ab239d7b7f94c2254340103f67e",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-5d4638f0-0b7d-4298-93fb-1f563afa687c.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1584045523",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a85bc1e2056b1ab2916960c20cef17e7\"",
-      "Last-Modified": "Mon, 10 Feb 2020 20:17:31 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:347958A:3E2493C:5E6A992D"
-    }
-  },
-  "uuid": "5d4638f0-0b7d-4298-93fb-1f563afa687c",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json
new file mode 100644
index 0000000000..5424ec3664
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "5d4638f0-0b7d-4298-93fb-1f563afa687c",
+  "name": "repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/c8c28eb749937ab239d7b7f94c2254340103f67e",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_c8c28eb749937ab239d7b7f94c2254340103f67e-4.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1584045523",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a85bc1e2056b1ab2916960c20cef17e7\"",
+      "Last-Modified": "Mon, 10 Feb 2020 20:17:31 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:347958A:3E2493C:5E6A992D"
+    }
+  },
+  "uuid": "5d4638f0-0b7d-4298-93fb-1f563afa687c",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11-f3ed22.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11-f3ed22.json
deleted file mode 100644
index 83f15083be..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11-f3ed22.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f3ed2248-279a-4998-86cf-210ed1262fe7",
-  "name": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-f3ed2248-279a-4998-86cf-210ed1262fe7.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"6a43338f72ad5d407835f11952313050\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:19:11 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479B0A:3E25004:5E6A9930"
-    }
-  },
-  "uuid": "f3ed2248-279a-4998-86cf-210ed1262fe7",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json
new file mode 100644
index 0000000000..26db02d7b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "f3ed2248-279a-4998-86cf-210ed1262fe7",
+  "name": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-11.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"6a43338f72ad5d407835f11952313050\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:19:11 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479B0A:3E25004:5E6A9930"
+    }
+  },
+  "uuid": "f3ed2248-279a-4998-86cf-210ed1262fe7",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12-e6d566.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12-e6d566.json
deleted file mode 100644
index f662fdeb87..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12-e6d566.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e6d566ed-eebd-42d8-86a0-16f113054b3e",
-  "name": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/efe737fa365a0187e052bc81391efbd84847a1b0",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-e6d566ed-eebd-42d8-86a0-16f113054b3e.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"2c552e0a3b669ad9dbbf55162320258f\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:17:55 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479B8F:3E250A7:5E6A9930"
-    }
-  },
-  "uuid": "e6d566ed-eebd-42d8-86a0-16f113054b3e",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json
new file mode 100644
index 0000000000..1ecc1a7f87
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "e6d566ed-eebd-42d8-86a0-16f113054b3e",
+  "name": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/efe737fa365a0187e052bc81391efbd84847a1b0",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-12.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"2c552e0a3b669ad9dbbf55162320258f\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:17:55 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479B8F:3E250A7:5E6A9930"
+    }
+  },
+  "uuid": "e6d566ed-eebd-42d8-86a0-16f113054b3e",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5-8aea29.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5-8aea29.json
deleted file mode 100644
index ed8d3766c1..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5-8aea29.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8aea2962-4bf2-41cd-8137-49b1e6c1e9bb",
-  "name": "repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/fb443a794e13921e7a9525a6976df900d897308f",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-8aea2962-4bf2-41cd-8137-49b1e6c1e9bb.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"805ac6abebbdb77df11e61900144b4a4\"",
-      "Last-Modified": "Mon, 10 Feb 2020 20:17:10 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:347969F:3E249E4:5E6A992D"
-    }
-  },
-  "uuid": "8aea2962-4bf2-41cd-8137-49b1e6c1e9bb",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json
new file mode 100644
index 0000000000..65d9b06566
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "8aea2962-4bf2-41cd-8137-49b1e6c1e9bb",
+  "name": "repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/fb443a794e13921e7a9525a6976df900d897308f",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_fb443a794e13921e7a9525a6976df900d897308f-5.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"805ac6abebbdb77df11e61900144b4a4\"",
+      "Last-Modified": "Mon, 10 Feb 2020 20:17:10 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:347969F:3E249E4:5E6A992D"
+    }
+  },
+  "uuid": "8aea2962-4bf2-41cd-8137-49b1e6c1e9bb",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1-5ed62e.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1-5ed62e.json
deleted file mode 100644
index 3a296e78cb..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1-5ed62e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5ed62e6e-2e24-40bf-a0ef-ed960a7ad354",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-5ed62e6e-2e24-40bf-a0ef-ed960a7ad354.json",
-    "headers": {
-      "Date": "Thu, 12 Mar 2020 20:18:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "1584045522",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"58f385a1b4274592de7c35a596875ec6\"",
-      "Last-Modified": "Thu, 12 Mar 2020 19:36:50 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DB8F:22CA3:3479259:3E2459C:5E6A992B"
-    }
-  },
-  "uuid": "5ed62e6e-2e24-40bf-a0ef-ed960a7ad354",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1.json
new file mode 100644
index 0000000000..d5d818b408
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/commitSignatureVerification/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "5ed62e6e-2e24-40bf-a0ef-ed960a7ad354",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 12 Mar 2020 20:18:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "1584045522",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"58f385a1b4274592de7c35a596875ec6\"",
+      "Last-Modified": "Thu, 12 Mar 2020 19:36:50 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, read:packages, repo, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DB8F:22CA3:3479259:3E2459C:5E6A992B"
+    }
+  },
+  "uuid": "5ed62e6e-2e24-40bf-a0ef-ed960a7ad354",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler-dea29c4a-c5b6-460d-8550-09d75d487830.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler-dea29c4a-c5b6-460d-8550-09d75d487830.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler-2.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-b564ee52-421b-4d1a-aa96-bdb613581b8a.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-b564ee52-421b-4d1a-aa96-bdb613581b8a.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_tags-7637217e-0e80-4f8b-bf01-93a7a97952fd.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_tags-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_tags-7637217e-0e80-4f8b-bf01-93a7a97952fd.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/repos_stapler_stapler_tags-3.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/user-bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/user-bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2-dea29c.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2-dea29c.json
deleted file mode 100644
index d972e46d06..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2-dea29c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "dea29c4a-c5b6-460d-8550-09d75d487830",
-  "name": "repos_stapler_stapler",
-  "request": {
-    "url": "/repos/stapler/stapler",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler-dea29c4a-c5b6-460d-8550-09d75d487830.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"449cae6ec2615b7bcbe15d6e821627cc\"",
-      "Last-Modified": "Tue, 27 Aug 2019 16:42:33 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99F:2C7D:C96DC:EC84C:5D769A6A"
-    }
-  },
-  "uuid": "dea29c4a-c5b6-460d-8550-09d75d487830",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2.json
new file mode 100644
index 0000000000..61e25b9ff1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "dea29c4a-c5b6-460d-8550-09d75d487830",
+  "name": "repos_stapler_stapler",
+  "request": {
+    "url": "/repos/stapler/stapler",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler-2.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"449cae6ec2615b7bcbe15d6e821627cc\"",
+      "Last-Modified": "Tue, 27 Aug 2019 16:42:33 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99F:2C7D:C96DC:EC84C:5D769A6A"
+    }
+  },
+  "uuid": "dea29c4a-c5b6-460d-8550-09d75d487830",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4-b564ee.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4-b564ee.json
deleted file mode 100644
index e386419d22..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4-b564ee.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "b564ee52-421b-4d1a-aa96-bdb613581b8a",
-  "name": "repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654",
-  "request": {
-    "url": "/repos/stapler/stapler/statuses/6a243869aa3c3f80579102d00848a0083953d654",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-b564ee52-421b-4d1a-aa96-bdb613581b8a.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5f8e313af31f78898aeeeae1b6f45a5b\"",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo, repo:status",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99F:2C7D:C9739:EC8B4:5D769A6A"
-    }
-  },
-  "uuid": "b564ee52-421b-4d1a-aa96-bdb613581b8a",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json
new file mode 100644
index 0000000000..760f7b1044
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "b564ee52-421b-4d1a-aa96-bdb613581b8a",
+  "name": "repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654",
+  "request": {
+    "url": "/repos/stapler/stapler/statuses/6a243869aa3c3f80579102d00848a0083953d654",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_statuses_6a243869aa3c3f80579102d00848a0083953d654-4.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5f8e313af31f78898aeeeae1b6f45a5b\"",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo, repo:status",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99F:2C7D:C9739:EC8B4:5D769A6A"
+    }
+  },
+  "uuid": "b564ee52-421b-4d1a-aa96-bdb613581b8a",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3-763721.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3-763721.json
deleted file mode 100644
index 5136b003fe..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3-763721.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "7637217e-0e80-4f8b-bf01-93a7a97952fd",
-  "name": "repos_stapler_stapler_tags",
-  "request": {
-    "url": "/repos/stapler/stapler/tags",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_tags-7637217e-0e80-4f8b-bf01-93a7a97952fd.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4931",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dcf4cf083a57185673e19420a37d0ca0\"",
-      "Last-Modified": "Tue, 27 Aug 2019 16:42:33 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Link": "<https://api.github.com/repositories/1548514/tags?page=2>; rel=\"next\", <https://api.github.com/repositories/1548514/tags?page=9>; rel=\"last\"",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99F:2C7D:C9716:EC893:5D769A6A"
-    }
-  },
-  "uuid": "7637217e-0e80-4f8b-bf01-93a7a97952fd",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3.json
new file mode 100644
index 0000000000..36f0f8cc4e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/repos_stapler_stapler_tags-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "7637217e-0e80-4f8b-bf01-93a7a97952fd",
+  "name": "repos_stapler_stapler_tags",
+  "request": {
+    "url": "/repos/stapler/stapler/tags",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_tags-3.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dcf4cf083a57185673e19420a37d0ca0\"",
+      "Last-Modified": "Tue, 27 Aug 2019 16:42:33 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Link": "<https://api.github.com/repositories/1548514/tags?page=2>; rel=\"next\", <https://api.github.com/repositories/1548514/tags?page=9>; rel=\"last\"",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99F:2C7D:C9716:EC893:5D769A6A"
+    }
+  },
+  "uuid": "7637217e-0e80-4f8b-bf01-93a7a97952fd",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1-bde54f.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1-bde54f.json
deleted file mode 100644
index 7f4beb7158..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1-bde54f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99F:2C7D:C96C8:EC833:5D769A69"
-    }
-  },
-  "uuid": "bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1.json
new file mode 100644
index 0000000000..63ab8fd0b1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/lastStatus/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99F:2C7D:C96C8:EC833:5D769A69"
+    }
+  },
+  "uuid": "bde54f7e-5b5a-49b2-b94c-a0cf8f7a0d1a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler-34276839-6f01-44ea-856d-5b26cc12edf8.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler-34276839-6f01-44ea-856d-5b26cc12edf8.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler-2.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits-6214feb0-5ed5-4325-8407-2f75bef1c4bd.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits-6214feb0-5ed5-4325-8407-2f75bef1c4bd.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits-3.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-4fa8c092-5fdf-4ac3-a09a-8713da340f66.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-4fa8c092-5fdf-4ac3-a09a-8713da340f66.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-ad6e998e-9ae1-4bae-9da2-1dd49495d5cb.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-ad6e998e-9ae1-4bae-9da2-1dd49495d5cb.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-c9650076-4963-4d6a-9c1c-07c6339a48dd.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-c9650076-4963-4d6a-9c1c-07c6339a48dd.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-b7c821b4-b43e-44a2-bea6-83304ffae91f.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-b7c821b4-b43e-44a2-bea6-83304ffae91f.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-dd34f14b-38e1-406d-94b8-c650832d9bd4.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-dd34f14b-38e1-406d-94b8-c650832d9bd4.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-3e6d369c-c2ff-4835-abb3-00858c380485.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-3e6d369c-c2ff-4835-abb3-00858c380485.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-8573f146-63d0-4ffe-9d91-e05573680be5.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-8573f146-63d0-4ffe-9d91-e05573680be5.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-4c78237a-7bc9-49ce-9a1b-0bed99e888b4.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-4c78237a-7bc9-49ce-9a1b-0bed99e888b4.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-a7972e0c-a2e0-4e50-bd1a-374cfad5576c.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-a7972e0c-a2e0-4e50-bd1a-374cfad5576c.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-d76af952-0ff3-4514-9a38-93d9570c5b3c.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-d76af952-0ff3-4514-9a38-93d9570c5b3c.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-73ac5fc1-ea49-4c48-bc8a-f306908d7836.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-73ac5fc1-ea49-4c48-bc8a-f306908d7836.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-77b7d93a-9cd6-48a5-af7d-2ee6e4efa296.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-77b7d93a-9cd6-48a5-af7d-2ee6e4efa296.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-1aa53060-8df1-4455-ae37-21eed443f58b.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-1aa53060-8df1-4455-ae37-21eed443f58b.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-45c73127-9113-4bb6-8193-cedf907fa96a.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-45c73127-9113-4bb6-8193-cedf907fa96a.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-35c73b49-8705-4fee-abd6-36c9f4bc2825.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-35c73b49-8705-4fee-abd6-36c9f4bc2825.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-fb5ea1a9-6086-40a2-a542-7a87ee6bb437.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-fb5ea1a9-6086-40a2-a542-7a87ee6bb437.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-3621ddfb-672d-47aa-8b45-5d15a3e6caaa.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-3621ddfb-672d-47aa-8b45-5d15a3e6caaa.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-ca95823a-7ad8-4b14-8d90-c619d98c589f.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-ca95823a-7ad8-4b14-8d90-c619d98c589f.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/user-1b6473bc-f679-44ec-8a6a-6a9d036c91aa.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/user-1b6473bc-f679-44ec-8a6a-6a9d036c91aa.json
rename to src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2-342768.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2-342768.json
deleted file mode 100644
index 145d7d307b..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2-342768.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "34276839-6f01-44ea-856d-5b26cc12edf8",
-  "name": "repos_stapler_stapler",
-  "request": {
-    "url": "/repos/stapler/stapler",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler-34276839-6f01-44ea-856d-5b26cc12edf8.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4955",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"449cae6ec2615b7bcbe15d6e821627cc\"",
-      "Last-Modified": "Tue, 27 Aug 2019 16:42:33 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2058:C010F:5D769A63"
-    }
-  },
-  "uuid": "34276839-6f01-44ea-856d-5b26cc12edf8",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2.json
new file mode 100644
index 0000000000..9afc542e56
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "34276839-6f01-44ea-856d-5b26cc12edf8",
+  "name": "repos_stapler_stapler",
+  "request": {
+    "url": "/repos/stapler/stapler",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler-2.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4955",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"449cae6ec2615b7bcbe15d6e821627cc\"",
+      "Last-Modified": "Tue, 27 Aug 2019 16:42:33 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2058:C010F:5D769A63"
+    }
+  },
+  "uuid": "34276839-6f01-44ea-856d-5b26cc12edf8",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3-6214fe.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3-6214fe.json
deleted file mode 100644
index 39dc791297..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3-6214fe.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "6214feb0-5ed5-4325-8407-2f75bef1c4bd",
-  "name": "repos_stapler_stapler_commits",
-  "request": {
-    "url": "/repos/stapler/stapler/commits?path=pom.xml",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits-6214feb0-5ed5-4325-8407-2f75bef1c4bd.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e637dc76b698b0b086c2753b30498d0a\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Link": "<https://api.github.com/repositories/1548514/commits?path=pom.xml&page=2>; rel=\"next\", <https://api.github.com/repositories/1548514/commits?path=pom.xml&page=14>; rel=\"last\"",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2072:C014B:5D769A64"
-    }
-  },
-  "uuid": "6214feb0-5ed5-4325-8407-2f75bef1c4bd",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3.json
new file mode 100644
index 0000000000..89ae639ea1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "6214feb0-5ed5-4325-8407-2f75bef1c4bd",
+  "name": "repos_stapler_stapler_commits",
+  "request": {
+    "url": "/repos/stapler/stapler/commits?path=pom.xml",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits-3.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e637dc76b698b0b086c2753b30498d0a\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Link": "<https://api.github.com/repositories/1548514/commits?path=pom.xml&page=2>; rel=\"next\", <https://api.github.com/repositories/1548514/commits?path=pom.xml&page=14>; rel=\"last\"",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2072:C014B:5D769A64"
+    }
+  },
+  "uuid": "6214feb0-5ed5-4325-8407-2f75bef1c4bd",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-4fa8c0.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-4fa8c0.json
deleted file mode 100644
index 6a43f95780..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8-4fa8c0.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4fa8c092-5fdf-4ac3-a09a-8713da340f66",
-  "name": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-4fa8c092-5fdf-4ac3-a09a-8713da340f66.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0563d0f3c97c60e7ae7e2195d94abb92\"",
-      "Last-Modified": "Mon, 19 Aug 2019 17:42:58 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2154:C0274:5D769A65"
-    }
-  },
-  "uuid": "4fa8c092-5fdf-4ac3-a09a-8713da340f66",
-  "persistent": true,
-  "scenarioName": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4-2",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
new file mode 100644
index 0000000000..6d6a4379c2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json
@@ -0,0 +1,51 @@
+{
+  "id": "4fa8c092-5fdf-4ac3-a09a-8713da340f66",
+  "name": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-8.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0563d0f3c97c60e7ae7e2195d94abb92\"",
+      "Last-Modified": "Mon, 19 Aug 2019 17:42:58 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2154:C0274:5D769A65"
+    }
+  },
+  "uuid": "4fa8c092-5fdf-4ac3-a09a-8713da340f66",
+  "persistent": true,
+  "scenarioName": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4-2",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9-ad6e99.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9-ad6e99.json
deleted file mode 100644
index b061b411a0..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9-ad6e99.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ad6e998e-9ae1-4bae-9da2-1dd49495d5cb",
-  "name": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-ad6e998e-9ae1-4bae-9da2-1dd49495d5cb.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0563d0f3c97c60e7ae7e2195d94abb92\"",
-      "Last-Modified": "Mon, 19 Aug 2019 17:42:58 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A217C:C02A1:5D769A66"
-    }
-  },
-  "uuid": "ad6e998e-9ae1-4bae-9da2-1dd49495d5cb",
-  "persistent": true,
-  "scenarioName": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
-  "requiredScenarioState": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4-2",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json
new file mode 100644
index 0000000000..905f00cbde
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "ad6e998e-9ae1-4bae-9da2-1dd49495d5cb",
+  "name": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_06b1108ec041fd8d6e7f54c8578d84a672fee9e4-9.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4948",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0563d0f3c97c60e7ae7e2195d94abb92\"",
+      "Last-Modified": "Mon, 19 Aug 2019 17:42:58 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A217C:C02A1:5D769A66"
+    }
+  },
+  "uuid": "ad6e998e-9ae1-4bae-9da2-1dd49495d5cb",
+  "persistent": true,
+  "scenarioName": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4",
+  "requiredScenarioState": "scenario-3-repos-stapler-stapler-commits-06b1108ec041fd8d6e7f54c8578d84a672fee9e4-2",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10-8ac20a.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10-8ac20a.json
deleted file mode 100644
index 907ee51386..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10-8ac20a.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7",
-  "name": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"210b8038c41dfbe9d59f53360f6c2b2b\"",
-      "Last-Modified": "Fri, 28 Jun 2019 16:21:18 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A219F:C02CD:5D769A66"
-    }
-  },
-  "uuid": "8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7",
-  "persistent": true,
-  "scenarioName": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679-2",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json
new file mode 100644
index 0000000000..6e9ff77dab
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json
@@ -0,0 +1,51 @@
+{
+  "id": "8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7",
+  "name": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-10.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4947",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"210b8038c41dfbe9d59f53360f6c2b2b\"",
+      "Last-Modified": "Fri, 28 Jun 2019 16:21:18 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A219F:C02CD:5D769A66"
+    }
+  },
+  "uuid": "8ac20af2-3f87-419a-b5cb-a96f5f2fd3c7",
+  "persistent": true,
+  "scenarioName": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679-2",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11-c96500.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11-c96500.json
deleted file mode 100644
index c7cf61e4ad..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11-c96500.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "c9650076-4963-4d6a-9c1c-07c6339a48dd",
-  "name": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-c9650076-4963-4d6a-9c1c-07c6339a48dd.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"210b8038c41dfbe9d59f53360f6c2b2b\"",
-      "Last-Modified": "Fri, 28 Jun 2019 16:21:18 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A21B5:C02E7:5D769A66"
-    }
-  },
-  "uuid": "c9650076-4963-4d6a-9c1c-07c6339a48dd",
-  "persistent": true,
-  "scenarioName": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
-  "requiredScenarioState": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679-2",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json
new file mode 100644
index 0000000000..e764b1ce09
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json
@@ -0,0 +1,50 @@
+{
+  "id": "c9650076-4963-4d6a-9c1c-07c6339a48dd",
+  "name": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_2a971c4e38c6d6693f7ad8b6768e4d74840d6679-11.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"210b8038c41dfbe9d59f53360f6c2b2b\"",
+      "Last-Modified": "Fri, 28 Jun 2019 16:21:18 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A21B5:C02E7:5D769A66"
+    }
+  },
+  "uuid": "c9650076-4963-4d6a-9c1c-07c6339a48dd",
+  "persistent": true,
+  "scenarioName": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679",
+  "requiredScenarioState": "scenario-4-repos-stapler-stapler-commits-2a971c4e38c6d6693f7ad8b6768e4d74840d6679-2",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12-dd34f1.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12-dd34f1.json
deleted file mode 100644
index 6885adfc0b..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12-dd34f1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "dd34f14b-38e1-406d-94b8-c650832d9bd4",
-  "name": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-dd34f14b-38e1-406d-94b8-c650832d9bd4.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4945",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ed3c1e9504b58dbca20c126b9e36718f\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:19:21 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A21D2:C030E:5D769A66"
-    }
-  },
-  "uuid": "dd34f14b-38e1-406d-94b8-c650832d9bd4",
-  "persistent": true,
-  "scenarioName": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d-2",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json
new file mode 100644
index 0000000000..161b61f15e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json
@@ -0,0 +1,51 @@
+{
+  "id": "dd34f14b-38e1-406d-94b8-c650832d9bd4",
+  "name": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-12.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4945",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ed3c1e9504b58dbca20c126b9e36718f\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:19:21 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A21D2:C030E:5D769A66"
+    }
+  },
+  "uuid": "dd34f14b-38e1-406d-94b8-c650832d9bd4",
+  "persistent": true,
+  "scenarioName": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d-2",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13-b7c821.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13-b7c821.json
deleted file mode 100644
index cdcfbc2279..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13-b7c821.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "b7c821b4-b43e-44a2-bea6-83304ffae91f",
-  "name": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-b7c821b4-b43e-44a2-bea6-83304ffae91f.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4944",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ed3c1e9504b58dbca20c126b9e36718f\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:19:21 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2201:C0339:5D769A66"
-    }
-  },
-  "uuid": "b7c821b4-b43e-44a2-bea6-83304ffae91f",
-  "persistent": true,
-  "scenarioName": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d",
-  "requiredScenarioState": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d-2",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json
new file mode 100644
index 0000000000..6229eeec78
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json
@@ -0,0 +1,50 @@
+{
+  "id": "b7c821b4-b43e-44a2-bea6-83304ffae91f",
+  "name": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_2f4ca0f03c1e6188867bddddce12ff213a107d9d-13.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4944",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ed3c1e9504b58dbca20c126b9e36718f\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:19:21 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2201:C0339:5D769A66"
+    }
+  },
+  "uuid": "b7c821b4-b43e-44a2-bea6-83304ffae91f",
+  "persistent": true,
+  "scenarioName": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d",
+  "requiredScenarioState": "scenario-5-repos-stapler-stapler-commits-2f4ca0f03c1e6188867bddddce12ff213a107d9d-2",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22-3e6d36.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22-3e6d36.json
deleted file mode 100644
index 252b6a9451..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22-3e6d36.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3e6d369c-c2ff-4835-abb3-00858c380485",
-  "name": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/4f260c560ec120f4e2c2ed727244690b1f4d5dca",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-3e6d369c-c2ff-4835-abb3-00858c380485.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4935",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2524c8a4ca350cca9cada10977584c79\"",
-      "Last-Modified": "Mon, 18 Feb 2019 22:52:29 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2369:C04E2:5D769A69"
-    }
-  },
-  "uuid": "3e6d369c-c2ff-4835-abb3-00858c380485",
-  "persistent": true,
-  "scenarioName": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca-2",
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json
new file mode 100644
index 0000000000..844a7eedd8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json
@@ -0,0 +1,51 @@
+{
+  "id": "3e6d369c-c2ff-4835-abb3-00858c380485",
+  "name": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/4f260c560ec120f4e2c2ed727244690b1f4d5dca",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-22.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4935",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2524c8a4ca350cca9cada10977584c79\"",
+      "Last-Modified": "Mon, 18 Feb 2019 22:52:29 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2369:C04E2:5D769A69"
+    }
+  },
+  "uuid": "3e6d369c-c2ff-4835-abb3-00858c380485",
+  "persistent": true,
+  "scenarioName": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca-2",
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23-8573f1.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23-8573f1.json
deleted file mode 100644
index 97c43832e0..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23-8573f1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "8573f146-63d0-4ffe-9d91-e05573680be5",
-  "name": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/4f260c560ec120f4e2c2ed727244690b1f4d5dca",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-8573f146-63d0-4ffe-9d91-e05573680be5.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2524c8a4ca350cca9cada10977584c79\"",
-      "Last-Modified": "Mon, 18 Feb 2019 22:52:29 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2386:C04FF:5D769A69"
-    }
-  },
-  "uuid": "8573f146-63d0-4ffe-9d91-e05573680be5",
-  "persistent": true,
-  "scenarioName": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca",
-  "requiredScenarioState": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca-2",
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json
new file mode 100644
index 0000000000..909bfe4d84
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json
@@ -0,0 +1,50 @@
+{
+  "id": "8573f146-63d0-4ffe-9d91-e05573680be5",
+  "name": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/4f260c560ec120f4e2c2ed727244690b1f4d5dca",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_4f260c560ec120f4e2c2ed727244690b1f4d5dca-23.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2524c8a4ca350cca9cada10977584c79\"",
+      "Last-Modified": "Mon, 18 Feb 2019 22:52:29 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2386:C04FF:5D769A69"
+    }
+  },
+  "uuid": "8573f146-63d0-4ffe-9d91-e05573680be5",
+  "persistent": true,
+  "scenarioName": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca",
+  "requiredScenarioState": "scenario-10-repos-stapler-stapler-commits-4f260c560ec120f4e2c2ed727244690b1f4d5dca-2",
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18-4c7823.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18-4c7823.json
deleted file mode 100644
index 03b0fbeb3b..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18-4c7823.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4c78237a-7bc9-49ce-9a1b-0bed99e888b4",
-  "name": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-4c78237a-7bc9-49ce-9a1b-0bed99e888b4.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4939",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a4dd6b0ee041284621a857e8ea23c8a1\"",
-      "Last-Modified": "Wed, 03 Apr 2019 19:03:54 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A22C3:C041E:5D769A68"
-    }
-  },
-  "uuid": "4c78237a-7bc9-49ce-9a1b-0bed99e888b4",
-  "persistent": true,
-  "scenarioName": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59-2",
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json
new file mode 100644
index 0000000000..504dad86db
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json
@@ -0,0 +1,51 @@
+{
+  "id": "4c78237a-7bc9-49ce-9a1b-0bed99e888b4",
+  "name": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-18.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4939",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a4dd6b0ee041284621a857e8ea23c8a1\"",
+      "Last-Modified": "Wed, 03 Apr 2019 19:03:54 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A22C3:C041E:5D769A68"
+    }
+  },
+  "uuid": "4c78237a-7bc9-49ce-9a1b-0bed99e888b4",
+  "persistent": true,
+  "scenarioName": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59-2",
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19-5f3cc3.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19-5f3cc3.json
deleted file mode 100644
index 87440e99e3..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19-5f3cc3.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b",
-  "name": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4938",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a4dd6b0ee041284621a857e8ea23c8a1\"",
-      "Last-Modified": "Wed, 03 Apr 2019 19:03:54 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A22E2:C0448:5D769A68"
-    }
-  },
-  "uuid": "5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b",
-  "persistent": true,
-  "scenarioName": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59",
-  "requiredScenarioState": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59-2",
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json
new file mode 100644
index 0000000000..7e398c672f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json
@@ -0,0 +1,50 @@
+{
+  "id": "5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b",
+  "name": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_53ce34d7d89c5172ae4f4f3167e35852b1910b59-19.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4938",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a4dd6b0ee041284621a857e8ea23c8a1\"",
+      "Last-Modified": "Wed, 03 Apr 2019 19:03:54 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A22E2:C0448:5D769A68"
+    }
+  },
+  "uuid": "5f3cc3b8-f231-4c58-9ffd-f0cf3c14d49b",
+  "persistent": true,
+  "scenarioName": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59",
+  "requiredScenarioState": "scenario-8-repos-stapler-stapler-commits-53ce34d7d89c5172ae4f4f3167e35852b1910b59-2",
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6-d76af9.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6-d76af9.json
deleted file mode 100644
index a25d896a95..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6-d76af9.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d76af952-0ff3-4514-9a38-93d9570c5b3c",
-  "name": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/6a243869aa3c3f80579102d00848a0083953d654",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-d76af952-0ff3-4514-9a38-93d9570c5b3c.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"94ef432d31efc82dd4627bbd7fdac3ea\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:42 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A20F4:C01FD:5D769A65"
-    }
-  },
-  "uuid": "d76af952-0ff3-4514-9a38-93d9570c5b3c",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654-2",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json
new file mode 100644
index 0000000000..04ea67d61f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "d76af952-0ff3-4514-9a38-93d9570c5b3c",
+  "name": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/6a243869aa3c3f80579102d00848a0083953d654",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-6.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"94ef432d31efc82dd4627bbd7fdac3ea\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:42 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A20F4:C01FD:5D769A65"
+    }
+  },
+  "uuid": "d76af952-0ff3-4514-9a38-93d9570c5b3c",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654-2",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-a7972e.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-a7972e.json
deleted file mode 100644
index 24c8f6d666..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7-a7972e.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "a7972e0c-a2e0-4e50-bd1a-374cfad5576c",
-  "name": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/6a243869aa3c3f80579102d00848a0083953d654",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-a7972e0c-a2e0-4e50-bd1a-374cfad5576c.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"94ef432d31efc82dd4627bbd7fdac3ea\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:42 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2139:C0242:5D769A65"
-    }
-  },
-  "uuid": "a7972e0c-a2e0-4e50-bd1a-374cfad5576c",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654",
-  "requiredScenarioState": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654-2",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
new file mode 100644
index 0000000000..a5ddc50e25
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "a7972e0c-a2e0-4e50-bd1a-374cfad5576c",
+  "name": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/6a243869aa3c3f80579102d00848a0083953d654",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_6a243869aa3c3f80579102d00848a0083953d654-7.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"94ef432d31efc82dd4627bbd7fdac3ea\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:42 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2139:C0242:5D769A65"
+    }
+  },
+  "uuid": "a7972e0c-a2e0-4e50-bd1a-374cfad5576c",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654",
+  "requiredScenarioState": "scenario-2-repos-stapler-stapler-commits-6a243869aa3c3f80579102d00848a0083953d654-2",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20-73ac5f.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20-73ac5f.json
deleted file mode 100644
index 9279da9090..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20-73ac5f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "73ac5fc1-ea49-4c48-bc8a-f306908d7836",
-  "name": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/72343298733508cced8dcb8eb43594bcc6130b26",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-73ac5fc1-ea49-4c48-bc8a-f306908d7836.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4937",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"133ab1934268062df543529934ac067f\"",
-      "Last-Modified": "Tue, 19 Feb 2019 21:27:25 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2333:C049A:5D769A68"
-    }
-  },
-  "uuid": "73ac5fc1-ea49-4c48-bc8a-f306908d7836",
-  "persistent": true,
-  "scenarioName": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26-2",
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json
new file mode 100644
index 0000000000..93d2251fe4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json
@@ -0,0 +1,51 @@
+{
+  "id": "73ac5fc1-ea49-4c48-bc8a-f306908d7836",
+  "name": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/72343298733508cced8dcb8eb43594bcc6130b26",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-20.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4937",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"133ab1934268062df543529934ac067f\"",
+      "Last-Modified": "Tue, 19 Feb 2019 21:27:25 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2333:C049A:5D769A68"
+    }
+  },
+  "uuid": "73ac5fc1-ea49-4c48-bc8a-f306908d7836",
+  "persistent": true,
+  "scenarioName": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26-2",
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21-77b7d9.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21-77b7d9.json
deleted file mode 100644
index 956e4a9a71..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21-77b7d9.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "77b7d93a-9cd6-48a5-af7d-2ee6e4efa296",
-  "name": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/72343298733508cced8dcb8eb43594bcc6130b26",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-77b7d93a-9cd6-48a5-af7d-2ee6e4efa296.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"133ab1934268062df543529934ac067f\"",
-      "Last-Modified": "Tue, 19 Feb 2019 21:27:25 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A2351:C04C1:5D769A68"
-    }
-  },
-  "uuid": "77b7d93a-9cd6-48a5-af7d-2ee6e4efa296",
-  "persistent": true,
-  "scenarioName": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26",
-  "requiredScenarioState": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26-2",
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json
new file mode 100644
index 0000000000..01f2652118
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json
@@ -0,0 +1,50 @@
+{
+  "id": "77b7d93a-9cd6-48a5-af7d-2ee6e4efa296",
+  "name": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/72343298733508cced8dcb8eb43594bcc6130b26",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_72343298733508cced8dcb8eb43594bcc6130b26-21.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"133ab1934268062df543529934ac067f\"",
+      "Last-Modified": "Tue, 19 Feb 2019 21:27:25 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A2351:C04C1:5D769A68"
+    }
+  },
+  "uuid": "77b7d93a-9cd6-48a5-af7d-2ee6e4efa296",
+  "persistent": true,
+  "scenarioName": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26",
+  "requiredScenarioState": "scenario-9-repos-stapler-stapler-commits-72343298733508cced8dcb8eb43594bcc6130b26-2",
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4-45c731.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4-45c731.json
deleted file mode 100644
index 506e53a1d4..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4-45c731.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "45c73127-9113-4bb6-8193-cedf907fa96a",
-  "name": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/950acbd60ed4289520dcd2a395e5d77f181e1cff",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-45c73127-9113-4bb6-8193-cedf907fa96a.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4953",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6726f0c54296f6478d8760f10a8946f5\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A20BD:C01B8:5D769A64"
-    }
-  },
-  "uuid": "45c73127-9113-4bb6-8193-cedf907fa96a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json
new file mode 100644
index 0000000000..88ee5fa5c9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json
@@ -0,0 +1,51 @@
+{
+  "id": "45c73127-9113-4bb6-8193-cedf907fa96a",
+  "name": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/950acbd60ed4289520dcd2a395e5d77f181e1cff",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-4.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6726f0c54296f6478d8760f10a8946f5\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A20BD:C01B8:5D769A64"
+    }
+  },
+  "uuid": "45c73127-9113-4bb6-8193-cedf907fa96a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5-1aa530.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5-1aa530.json
deleted file mode 100644
index 556d56b855..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5-1aa530.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "1aa53060-8df1-4455-ae37-21eed443f58b",
-  "name": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/950acbd60ed4289520dcd2a395e5d77f181e1cff",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-1aa53060-8df1-4455-ae37-21eed443f58b.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4952",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6726f0c54296f6478d8760f10a8946f5\"",
-      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A20D9:C01DE:5D769A65"
-    }
-  },
-  "uuid": "1aa53060-8df1-4455-ae37-21eed443f58b",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff",
-  "requiredScenarioState": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff-2",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json
new file mode 100644
index 0000000000..39a3491a08
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json
@@ -0,0 +1,50 @@
+{
+  "id": "1aa53060-8df1-4455-ae37-21eed443f58b",
+  "name": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/950acbd60ed4289520dcd2a395e5d77f181e1cff",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_950acbd60ed4289520dcd2a395e5d77f181e1cff-5.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4952",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6726f0c54296f6478d8760f10a8946f5\"",
+      "Last-Modified": "Mon, 19 Aug 2019 18:38:53 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A20D9:C01DE:5D769A65"
+    }
+  },
+  "uuid": "1aa53060-8df1-4455-ae37-21eed443f58b",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff",
+  "requiredScenarioState": "scenario-1-repos-stapler-stapler-commits-950acbd60ed4289520dcd2a395e5d77f181e1cff-2",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14-35c73b.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14-35c73b.json
deleted file mode 100644
index 493011cf49..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14-35c73b.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "35c73b49-8705-4fee-abd6-36c9f4bc2825",
-  "name": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-35c73b49-8705-4fee-abd6-36c9f4bc2825.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4943",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b596f4895bf3131a6d518d8a4c5a4f41\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:19:11 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A222D:C0378:5D769A67"
-    }
-  },
-  "uuid": "35c73b49-8705-4fee-abd6-36c9f4bc2825",
-  "persistent": true,
-  "scenarioName": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321-2",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json
new file mode 100644
index 0000000000..7a084b60bd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json
@@ -0,0 +1,51 @@
+{
+  "id": "35c73b49-8705-4fee-abd6-36c9f4bc2825",
+  "name": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-14.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4943",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b596f4895bf3131a6d518d8a4c5a4f41\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:19:11 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A222D:C0378:5D769A67"
+    }
+  },
+  "uuid": "35c73b49-8705-4fee-abd6-36c9f4bc2825",
+  "persistent": true,
+  "scenarioName": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321-2",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15-fb5ea1.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15-fb5ea1.json
deleted file mode 100644
index ed83dce96c..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15-fb5ea1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "fb5ea1a9-6086-40a2-a542-7a87ee6bb437",
-  "name": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-fb5ea1a9-6086-40a2-a542-7a87ee6bb437.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4942",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b596f4895bf3131a6d518d8a4c5a4f41\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:19:11 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A226E:C03A1:5D769A67"
-    }
-  },
-  "uuid": "fb5ea1a9-6086-40a2-a542-7a87ee6bb437",
-  "persistent": true,
-  "scenarioName": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321",
-  "requiredScenarioState": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321-2",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json
new file mode 100644
index 0000000000..a1ac6355f0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json
@@ -0,0 +1,50 @@
+{
+  "id": "fb5ea1a9-6086-40a2-a542-7a87ee6bb437",
+  "name": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_d922b808068cf95d6f6ab624ce2c7f49d51f5321-15.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4942",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b596f4895bf3131a6d518d8a4c5a4f41\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:19:11 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A226E:C03A1:5D769A67"
+    }
+  },
+  "uuid": "fb5ea1a9-6086-40a2-a542-7a87ee6bb437",
+  "persistent": true,
+  "scenarioName": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321",
+  "requiredScenarioState": "scenario-6-repos-stapler-stapler-commits-d922b808068cf95d6f6ab624ce2c7f49d51f5321-2",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16-3621dd.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16-3621dd.json
deleted file mode 100644
index c4e9e0c6cf..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16-3621dd.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3621ddfb-672d-47aa-8b45-5d15a3e6caaa",
-  "name": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/efe737fa365a0187e052bc81391efbd84847a1b0",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-3621ddfb-672d-47aa-8b45-5d15a3e6caaa.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4941",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"105b96446da95ff8ee109ccaf4fd0d26\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:17:55 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A228A:C03E4:5D769A67"
-    }
-  },
-  "uuid": "3621ddfb-672d-47aa-8b45-5d15a3e6caaa",
-  "persistent": true,
-  "scenarioName": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0-2",
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json
new file mode 100644
index 0000000000..93db3d3521
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json
@@ -0,0 +1,51 @@
+{
+  "id": "3621ddfb-672d-47aa-8b45-5d15a3e6caaa",
+  "name": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/efe737fa365a0187e052bc81391efbd84847a1b0",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-16.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"105b96446da95ff8ee109ccaf4fd0d26\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:17:55 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A228A:C03E4:5D769A67"
+    }
+  },
+  "uuid": "3621ddfb-672d-47aa-8b45-5d15a3e6caaa",
+  "persistent": true,
+  "scenarioName": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0-2",
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17-ca9582.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17-ca9582.json
deleted file mode 100644
index 47750ecc30..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17-ca9582.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ca95823a-7ad8-4b14-8d90-c619d98c589f",
-  "name": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0",
-  "request": {
-    "url": "/repos/stapler/stapler/commits/efe737fa365a0187e052bc81391efbd84847a1b0",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-ca95823a-7ad8-4b14-8d90-c619d98c589f.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4940",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"105b96446da95ff8ee109ccaf4fd0d26\"",
-      "Last-Modified": "Mon, 08 Apr 2019 14:17:55 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A22A6:C0400:5D769A67"
-    }
-  },
-  "uuid": "ca95823a-7ad8-4b14-8d90-c619d98c589f",
-  "persistent": true,
-  "scenarioName": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0",
-  "requiredScenarioState": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0-2",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json
new file mode 100644
index 0000000000..febb0e8196
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json
@@ -0,0 +1,50 @@
+{
+  "id": "ca95823a-7ad8-4b14-8d90-c619d98c589f",
+  "name": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0",
+  "request": {
+    "url": "/repos/stapler/stapler/commits/efe737fa365a0187e052bc81391efbd84847a1b0",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_stapler_stapler_commits_efe737fa365a0187e052bc81391efbd84847a1b0-17.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:31:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4940",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"105b96446da95ff8ee109ccaf4fd0d26\"",
+      "Last-Modified": "Mon, 08 Apr 2019 14:17:55 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A22A6:C0400:5D769A67"
+    }
+  },
+  "uuid": "ca95823a-7ad8-4b14-8d90-c619d98c589f",
+  "persistent": true,
+  "scenarioName": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0",
+  "requiredScenarioState": "scenario-7-repos-stapler-stapler-commits-efe737fa365a0187e052bc81391efbd84847a1b0-2",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1-1b6473.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1-1b6473.json
deleted file mode 100644
index 440c098f2d..0000000000
--- a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1-1b6473.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1b6473bc-f679-44ec-8a6a-6a9d036c91aa",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1b6473bc-f679-44ec-8a6a-6a9d036c91aa.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 18:30:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4956",
-      "X-RateLimit-Reset": "1568056823",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D99C:7CF7:A201C:C00FA:5D769A63"
-    }
-  },
-  "uuid": "1b6473bc-f679-44ec-8a6a-6a9d036c91aa",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1.json b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1.json
new file mode 100644
index 0000000000..d6d9adfd05
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/CommitTest/wiremock/listFiles/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1b6473bc-f679-44ec-8a6a-6a9d036c91aa",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 18:30:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1568056823",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D99C:7CF7:A201C:C00FA:5D769A63"
+    }
+  },
+  "uuid": "1b6473bc-f679-44ec-8a6a-6a9d036c91aa",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHAppTest/wiremock/createToken/mappings/mapping-app-installations-3755540-access_tokens-7W6Uy.json b/src/test/resources/org/kohsuke/github/GHAppTest/wiremock/createToken/mappings/mapping-app-installations-3755540-access_tokens-7W6Uy.json
index 2a1be12296..e88118bce1 100644
--- a/src/test/resources/org/kohsuke/github/GHAppTest/wiremock/createToken/mappings/mapping-app-installations-3755540-access_tokens-7W6Uy.json
+++ b/src/test/resources/org/kohsuke/github/GHAppTest/wiremock/createToken/mappings/mapping-app-installations-3755540-access_tokens-7W6Uy.json
@@ -1,11 +1,12 @@
 {
-  "id" : "ae92606f-6db0-3ebf-87ed-b20c38645208",
-  "request" : {
-    "url" : "/app/installations/11111111/access_tokens",
-    "method" : "POST",
-    "bodyPatterns" : [ {
-      "equalToJson" : "{}",
-      "ignoreArrayOrder" : true,
+  "id": "ae92606f-6db0-3ebf-87ed-b20c38645208",
+  "request": {
+    "url": "/app/installations/11111111/access_tokens",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{}",
+        "ignoreArrayOrder": true,
         "ignoreExtraElements": false
       }
     ],
@@ -15,28 +16,31 @@
       }
     }
   },
-  "response" : {
-    "status" : 201,
-    "bodyFileName" : "body-app-installations-3755540-access_tokens-7W6Uy.json",
-    "headers" : {
-      "Date" : "Thu, 19 Dec 2019 11:27:59 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Server" : "GitHub.com",
-      "Status" : "201 Created",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "\"d408f945674845ed4d6d9a31d81d0e4d\"",
-      "X-GitHub-Media-Type" : "github.machine-man-preview; format=json",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "DC42:5297:3DD9A:4A550:5DFB5EBE"
+  "response": {
+    "status": 201,
+    "bodyFileName": "body-app-installations-3755540-access_tokens-7W6Uy.json",
+    "headers": {
+      "Date": "Thu, 19 Dec 2019 11:27:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d408f945674845ed4d6d9a31d81d0e4d\"",
+      "X-GitHub-Media-Type": "github.machine-man-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DC42:5297:3DD9A:4A550:5DFB5EBE"
     }
   },
-  "uuid" : "ae92606f-6db0-3ebf-87ed-b20c38645208"
+  "uuid": "ae92606f-6db0-3ebf-87ed-b20c38645208"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/user-c38b2b92-6669-42ee-838f-7422bb4f300d.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/user-c38b2b92-6669-42ee-838f-7422bb4f300d.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2-02ee49.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3-040c1d.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3-040c1d.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4-aa97cf.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4-aa97cf.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/repos_github-api-test-org_temp-testenablebranchprotections-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1-c38b2b.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1-c38b2b.json
deleted file mode 100644
index e49c3e2dae..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1-c38b2b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c38b2b92-6669-42ee-838f-7422bb4f300d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c38b2b92-6669-42ee-838f-7422bb4f300d.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4945",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C495:6994:5EC24:6F69A:5DD35B04"
-    }
-  },
-  "uuid": "c38b2b92-6669-42ee-838f-7422bb4f300d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1.json
new file mode 100644
index 0000000000..745829bf0b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableBranchProtections/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c38b2b92-6669-42ee-838f-7422bb4f300d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4945",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C495:6994:5EC24:6F69A:5DD35B04"
+    }
+  },
+  "uuid": "c38b2b92-6669-42ee-838f-7422bb4f300d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly-bc30994e-6cf0-42fa-b6e8-7c21803346f0.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly-bc30994e-6cf0-42fa-b6e8-7c21803346f0.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-88328244-0928-4737-b1a5-674c59027a58.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-88328244-0928-4737-b1a5-674c59027a58.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-90ab1b21-6ee8-4607-bcf5-f14061c3936f.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-90ab1b21-6ee8-4607-bcf5-f14061c3936f.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-857c661d-4431-4504-9088-c0bbf3a8d667.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-857c661d-4431-4504-9088-c0bbf3a8d667.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/user-100e4407-70e6-4ea4-aad4-70d93d35dd38.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/user-100e4407-70e6-4ea4-aad4-70d93d35dd38.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2-bc3099.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2-bc3099.json
deleted file mode 100644
index 6404678791..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2-bc3099.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bc30994e-6cf0-42fa-b6e8-7c21803346f0",
-  "name": "repos_github-api-test-org_temp-testenableprotectiononly",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly-bc30994e-6cf0-42fa-b6e8-7c21803346f0.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4911",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5a52275541e01dfed3bd8a7c449f6b0f\"",
-      "Last-Modified": "Tue, 19 Nov 2019 03:01:49 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4A6:4FEE:63367:740CA:5DD35B16"
-    }
-  },
-  "uuid": "bc30994e-6cf0-42fa-b6e8-7c21803346f0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2.json
new file mode 100644
index 0000000000..1d0ec0827d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "bc30994e-6cf0-42fa-b6e8-7c21803346f0",
+  "name": "repos_github-api-test-org_temp-testenableprotectiononly",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly-2.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4911",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5a52275541e01dfed3bd8a7c449f6b0f\"",
+      "Last-Modified": "Tue, 19 Nov 2019 03:01:49 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4A6:4FEE:63367:740CA:5DD35B16"
+    }
+  },
+  "uuid": "bc30994e-6cf0-42fa-b6e8-7c21803346f0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3-883282.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3-883282.json
deleted file mode 100644
index e770c21644..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3-883282.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "88328244-0928-4737-b1a5-674c59027a58",
-  "name": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly/branches/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master-88328244-0928-4737-b1a5-674c59027a58.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4910",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e50899adde0516ef560b178cfb58c9f4\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4A6:4FEE:6338F:74499:5DD35B1D"
-    }
-  },
-  "uuid": "88328244-0928-4737-b1a5-674c59027a58",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json
new file mode 100644
index 0000000000..4897281647
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "88328244-0928-4737-b1a5-674c59027a58",
+  "name": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly/branches/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master-3.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e50899adde0516ef560b178cfb58c9f4\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4A6:4FEE:6338F:74499:5DD35B1D"
+    }
+  },
+  "uuid": "88328244-0928-4737-b1a5-674c59027a58",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5-90ab1b.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5-90ab1b.json
deleted file mode 100644
index 79d3b3f860..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5-90ab1b.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "90ab1b21-6ee8-4607-bcf5-f14061c3936f",
-  "name": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly/branches/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master-90ab1b21-6ee8-4607-bcf5-f14061c3936f.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6e892f7878965d871f858924a9515a9a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4A6:4FEE:633CF:744E4:5DD35B1E"
-    }
-  },
-  "uuid": "90ab1b21-6ee8-4607-bcf5-f14061c3936f",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master-2",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json
new file mode 100644
index 0000000000..35abd27d2d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json
@@ -0,0 +1,49 @@
+{
+  "id": "90ab1b21-6ee8-4607-bcf5-f14061c3936f",
+  "name": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly/branches/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master-5.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6e892f7878965d871f858924a9515a9a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4A6:4FEE:633CF:744E4:5DD35B1E"
+    }
+  },
+  "uuid": "90ab1b21-6ee8-4607-bcf5-f14061c3936f",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testEnableProtectionOnly-branches-master-2",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4-857c66.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4-857c66.json
deleted file mode 100644
index ac180455df..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4-857c66.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "857c661d-4431-4504-9088-c0bbf3a8d667",
-  "name": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly/branches/master/protection",
-    "method": "PUT",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"required_pull_request_reviews\":null,\"required_status_checks\":null,\"restrictions\":null,\"enforce_admins\":false}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.luke-cage-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-857c661d-4431-4504-9088-c0bbf3a8d667.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4909",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"48347246916d88cb97b0bff8a430e78c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.luke-cage-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4A6:4FEE:633A5:744B7:5DD35B1E"
-    }
-  },
-  "uuid": "857c661d-4431-4504-9088-c0bbf3a8d667",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json
new file mode 100644
index 0000000000..fe1ce17682
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "857c661d-4431-4504-9088-c0bbf3a8d667",
+  "name": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testEnableProtectionOnly/branches/master/protection",
+    "method": "PUT",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"required_pull_request_reviews\":null,\"required_status_checks\":null,\"restrictions\":null,\"enforce_admins\":false}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.luke-cage-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testenableprotectiononly_branches_master_protection-4.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4909",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"48347246916d88cb97b0bff8a430e78c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.luke-cage-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4A6:4FEE:633A5:744B7:5DD35B1E"
+    }
+  },
+  "uuid": "857c661d-4431-4504-9088-c0bbf3a8d667",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1-100e44.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1-100e44.json
deleted file mode 100644
index 0656ab50b9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1-100e44.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "100e4407-70e6-4ea4-aad4-70d93d35dd38",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-100e4407-70e6-4ea4-aad4-70d93d35dd38.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4A6:4FEE:63031:740B3:5DD35B16"
-    }
-  },
-  "uuid": "100e4407-70e6-4ea4-aad4-70d93d35dd38",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1.json
new file mode 100644
index 0000000000..bd1d8c034f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableProtectionOnly/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "100e4407-70e6-4ea4-aad4-70d93d35dd38",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4A6:4FEE:63031:740B3:5DD35B16"
+    }
+  },
+  "uuid": "100e4407-70e6-4ea4-aad4-70d93d35dd38",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly-318e0aa4-9fc4-4f30-8174-400001f1bae4.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly-318e0aa4-9fc4-4f30-8174-400001f1bae4.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-0e0c4c56-198f-4d87-b13e-b146cad7ffdb.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-0e0c4c56-198f-4d87-b13e-b146cad7ffdb.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/user-64a67881-ce5e-4dd2-9d28-af9f67a4d9d1.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/user-64a67881-ce5e-4dd2-9d28-af9f67a4d9d1.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2-318e0a.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2-318e0a.json
deleted file mode 100644
index 43ddf9baac..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2-318e0a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "318e0aa4-9fc4-4f30-8174-400001f1bae4",
-  "name": "repos_github-api-test-org_temp-testenablerequirereviewsonly",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testEnableRequireReviewsOnly",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testenablerequirereviewsonly-318e0aa4-9fc4-4f30-8174-400001f1bae4.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4924",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2b8d8ba2c42054c376d47a34ded30f4b\"",
-      "Last-Modified": "Tue, 19 Nov 2019 03:01:40 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C49E:6D70:39A9D:4459F:5DD35B0D"
-    }
-  },
-  "uuid": "318e0aa4-9fc4-4f30-8174-400001f1bae4",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json
new file mode 100644
index 0000000000..13958801a6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "318e0aa4-9fc4-4f30-8174-400001f1bae4",
+  "name": "repos_github-api-test-org_temp-testenablerequirereviewsonly",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testEnableRequireReviewsOnly",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testenablerequirereviewsonly-2.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4924",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2b8d8ba2c42054c376d47a34ded30f4b\"",
+      "Last-Modified": "Tue, 19 Nov 2019 03:01:40 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C49E:6D70:39A9D:4459F:5DD35B0D"
+    }
+  },
+  "uuid": "318e0aa4-9fc4-4f30-8174-400001f1bae4",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3-0e0c4c.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3-0e0c4c.json
deleted file mode 100644
index ad0ce3b564..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3-0e0c4c.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "0e0c4c56-198f-4d87-b13e-b146cad7ffdb",
-  "name": "repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testEnableRequireReviewsOnly/branches/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-0e0c4c56-198f-4d87-b13e-b146cad7ffdb.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4923",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"51ae00091b56c866a8b2b00d1a3e57ec\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C49E:6D70:39AA6:447F2:5DD35B15"
-    }
-  },
-  "uuid": "0e0c4c56-198f-4d87-b13e-b146cad7ffdb",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json
new file mode 100644
index 0000000000..2412c448cf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "0e0c4c56-198f-4d87-b13e-b146cad7ffdb",
+  "name": "repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testEnableRequireReviewsOnly/branches/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master-3.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4923",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"51ae00091b56c866a8b2b00d1a3e57ec\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C49E:6D70:39AA6:447F2:5DD35B15"
+    }
+  },
+  "uuid": "0e0c4c56-198f-4d87-b13e-b146cad7ffdb",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4-b57fab.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/repos_github-api-test-org_temp-testenablerequirereviewsonly_branches_master_protection-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1-64a678.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1-64a678.json
deleted file mode 100644
index d4fe4602da..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1-64a678.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "64a67881-ce5e-4dd2-9d28-af9f67a4d9d1",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-64a67881-ce5e-4dd2-9d28-af9f67a4d9d1.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C49E:6D70:398BA:44594:5DD35B0D"
-    }
-  },
-  "uuid": "64a67881-ce5e-4dd2-9d28-af9f67a4d9d1",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1.json
new file mode 100644
index 0000000000..8a6e8391c1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testEnableRequireReviewsOnly/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "64a67881-ce5e-4dd2-9d28-af9f67a4d9d1",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C49E:6D70:398BA:44594:5DD35B0D"
+    }
+  },
+  "uuid": "64a67881-ce5e-4dd2-9d28-af9f67a4d9d1",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits-126c7a91-25f8-4610-a015-12535c6f79bd.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits-126c7a91-25f8-4610-a015-12535c6f79bd.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master-7a0577f3-c41c-4cbe-9965-f6f53aea602d.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master-7a0577f3-c41c-4cbe-9965-f6f53aea602d.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/user-94ed9a81-5dda-4f29-8f0b-18eab8a75f14.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/user-94ed9a81-5dda-4f29-8f0b-18eab8a75f14.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2-126c7a.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2-126c7a.json
deleted file mode 100644
index ae7ca0f649..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2-126c7a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "126c7a91-25f8-4610-a015-12535c6f79bd",
-  "name": "repos_github-api-test-org_temp-testsignedcommits",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testSignedCommits",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testsignedcommits-126c7a91-25f8-4610-a015-12535c6f79bd.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0f68d4fb4620d1d60575c184b481409e\"",
-      "Last-Modified": "Tue, 19 Nov 2019 03:01:58 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4B1:6D6F:205F5:2518C:5DD35B1F"
-    }
-  },
-  "uuid": "126c7a91-25f8-4610-a015-12535c6f79bd",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2.json
new file mode 100644
index 0000000000..2ec9782988
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "126c7a91-25f8-4610-a015-12535c6f79bd",
+  "name": "repos_github-api-test-org_temp-testsignedcommits",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testSignedCommits",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testsignedcommits-2.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0f68d4fb4620d1d60575c184b481409e\"",
+      "Last-Modified": "Tue, 19 Nov 2019 03:01:58 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4B1:6D6F:205F5:2518C:5DD35B1F"
+    }
+  },
+  "uuid": "126c7a91-25f8-4610-a015-12535c6f79bd",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3-7a0577.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3-7a0577.json
deleted file mode 100644
index 6a1a6a8cdc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3-7a0577.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "7a0577f3-c41c-4cbe-9965-f6f53aea602d",
-  "name": "repos_github-api-test-org_temp-testsignedcommits_branches_master",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testSignedCommits/branches/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testsignedcommits_branches_master-7a0577f3-c41c-4cbe-9965-f6f53aea602d.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64cf89312c87f9689cb2a8583eeddda2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4B1:6D6F:20604:252C3:5DD35B26"
-    }
-  },
-  "uuid": "7a0577f3-c41c-4cbe-9965-f6f53aea602d",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json
new file mode 100644
index 0000000000..9e2a947e51
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "7a0577f3-c41c-4cbe-9965-f6f53aea602d",
+  "name": "repos_github-api-test-org_temp-testsignedcommits_branches_master",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testSignedCommits/branches/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testsignedcommits_branches_master-3.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64cf89312c87f9689cb2a8583eeddda2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4B1:6D6F:20604:252C3:5DD35B26"
+    }
+  },
+  "uuid": "7a0577f3-c41c-4cbe-9965-f6f53aea602d",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4-4b8a92.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4-4b8a92.json
deleted file mode 100644
index f972b51ad7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4-4b8a92.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5",
-  "name": "repos_github-api-test-org_temp-testsignedcommits_branches_master_protection",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testSignedCommits/branches/master/protection",
-    "method": "PUT",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"required_pull_request_reviews\":null,\"required_status_checks\":null,\"restrictions\":null,\"enforce_admins\":false}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.luke-cage-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4895",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"da9d21f9528a07ca0c4ac56de0278d58\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.luke-cage-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4B1:6D6F:2060C:252CE:5DD35B26"
-    }
-  },
-  "uuid": "4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json
new file mode 100644
index 0000000000..a722c9d8c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5",
+  "name": "repos_github-api-test-org_temp-testsignedcommits_branches_master_protection",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testSignedCommits/branches/master/protection",
+    "method": "PUT",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"required_pull_request_reviews\":null,\"required_status_checks\":null,\"restrictions\":null,\"enforce_admins\":false}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.luke-cage-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testsignedcommits_branches_master_protection-4.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4895",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"da9d21f9528a07ca0c4ac56de0278d58\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.luke-cage-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4B1:6D6F:2060C:252CE:5DD35B26"
+    }
+  },
+  "uuid": "4b8a92a8-3dc5-40ba-96aa-f5fcd41eedd5",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-5-c0150d.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-5-c0150d.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-6-e29707.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-6-e29707.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-7-fa5a0d.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-7-fa5a0d.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-8-8c2a08.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-8-8c2a08.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-9-c0efc3.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-9-c0efc3.json
rename to src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/repos_github-api-test-org_temp-testsignedcommits_branches_master_protection_required_signatures-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1-94ed9a.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1-94ed9a.json
deleted file mode 100644
index 629ae13ee0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1-94ed9a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "94ed9a81-5dda-4f29-8f0b-18eab8a75f14",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-94ed9a81-5dda-4f29-8f0b-18eab8a75f14.json",
-    "headers": {
-      "Date": "Tue, 19 Nov 2019 03:01:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4905",
-      "X-RateLimit-Reset": "1574135997",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C4B1:6D6F:204F4:25187:5DD35B1F"
-    }
-  },
-  "uuid": "94ed9a81-5dda-4f29-8f0b-18eab8a75f14",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1.json
new file mode 100644
index 0000000000..4f44765e04
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHBranchProtectionTest/wiremock/testSignedCommits/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "94ed9a81-5dda-4f29-8f0b-18eab8a75f14",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 19 Nov 2019 03:01:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4905",
+      "X-RateLimit-Reset": "1574135997",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a7d3d02f0490e723eacdd27e24979424\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C4B1:6D6F:204F4:25187:5DD35B1F"
+    }
+  },
+  "uuid": "94ed9a81-5dda-4f29-8f0b-18eab8a75f14",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-6cfc78af-700f-404c-aef4-81cb448644d9.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-6cfc78af-700f-404c-aef4-81cb448644d9.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-e50803.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6-3cdae0.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10-a5a649.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11-47d978.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3-a97122.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4-5b2d08.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5-4be43b.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7-64a83a.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8-04f85e.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9-1d4297.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_testdirectory-50_test-file-tocreate-1txt-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json
deleted file mode 100644
index b0158ad870..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1-6cfc78.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6cfc78af-700f-404c-aef4-81cb448644d9",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-6cfc78af-700f-404c-aef4-81cb448644d9.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4926",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEAB:6915:6C7A3:824FA:5DDC7B57"
-    }
-  },
-  "uuid": "6cfc78af-700f-404c-aef4-81cb448644d9",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1.json
new file mode 100644
index 0000000000..aebd910dad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testCRUDContent/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "6cfc78af-700f-404c-aef4-81cb448644d9",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4926",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEAB:6915:6C7A3:824FA:5DDC7B57"
+    }
+  },
+  "uuid": "6cfc78af-700f-404c-aef4-81cb448644d9",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-34ca1601-0b3c-4808-b51e-b436851e0efd.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-34ca1601-0b3c-4808-b51e-b436851e0efd.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json
deleted file mode 100644
index 4fedc61a40..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1d1a48.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1d1a483f-3df5-43a6-8ce8-63f9772a49f2",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-1d1a483f-3df5-43a6-8ce8-63f9772a49f2.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE98:52E4:1D4D1:21A8E:5DDC7B51"
-    }
-  },
-  "uuid": "1d1a483f-3df5-43a6-8ce8-63f9772a49f2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..8629e34945
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "1d1a483f-3df5-43a6-8ce8-63f9772a49f2",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE98:52E4:1D4D1:21A8E:5DDC7B51"
+    }
+  },
+  "uuid": "1d1a483f-3df5-43a6-8ce8-63f9772a49f2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-2d908c.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json
deleted file mode 100644
index 5b214a58b0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1-34ca16.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "34ca1601-0b3c-4808-b51e-b436851e0efd",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-34ca1601-0b3c-4808-b51e-b436851e0efd.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE98:52E4:1D4BD:21A8C:5DDC7B51"
-    }
-  },
-  "uuid": "34ca1601-0b3c-4808-b51e-b436851e0efd",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1.json
new file mode 100644
index 0000000000..eefafc1e77
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContent/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "34ca1601-0b3c-4808-b51e-b436851e0efd",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE98:52E4:1D4BD:21A8C:5DDC7B51"
+    }
+  },
+  "uuid": "34ca1601-0b3c-4808-b51e-b436851e0efd",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json
deleted file mode 100644
index 65a6c785ad..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-a5c7d0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a5c7d08d-fd5b-4564-ac11-03cf714fae84",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-a5c7d08d-fd5b-4564-ac11-03cf714fae84.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4938",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE9E:273E:18D5DB:1D4F42:5DDC7B54"
-    }
-  },
-  "uuid": "a5c7d08d-fd5b-4564-ac11-03cf714fae84",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..70cd9dc7f5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "a5c7d08d-fd5b-4564-ac11-03cf714fae84",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4938",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE9E:273E:18D5DB:1D4F42:5DDC7B54"
+    }
+  },
+  "uuid": "a5c7d08d-fd5b-4564-ac11-03cf714fae84",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3-462ae7.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-dir-with-3-entries-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json
deleted file mode 100644
index 74b4e7134c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1-ebccdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ebccdfec-1cc2-4880-9f10-a0de20895d1a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ebccdfec-1cc2-4880-9f10-a0de20895d1a.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4942",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE9E:273E:18D56B:1D4F25:5DDC7B54"
-    }
-  },
-  "uuid": "ebccdfec-1cc2-4880-9f10-a0de20895d1a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1.json
new file mode 100644
index 0000000000..3f35dfac0e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetDirectoryContentTrailingSlash/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "ebccdfec-1cc2-4880-9f10-a0de20895d1a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4942",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE9E:273E:18D56B:1D4F25:5DDC7B54"
+    }
+  },
+  "uuid": "ebccdfec-1cc2-4880-9f10-a0de20895d1a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-afa831d7-4300-49c9-8451-d76fecb86330.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-afa831d7-4300-49c9-8451-d76fecb86330.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json
deleted file mode 100644
index aabd9cb249..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-1279fb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1279fb1b-4a2a-493a-b29a-96a060e4d3a5",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-1279fb1b-4a2a-493a-b29a-96a060e4d3a5.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEA5:25D8:19CAB6:1E5EE4:5DDC7B56"
-    }
-  },
-  "uuid": "1279fb1b-4a2a-493a-b29a-96a060e4d3a5",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..98c9aedf40
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "1279fb1b-4a2a-493a-b29a-96a060e4d3a5",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"24ee70d5bca0cf60cc0a6c1bafcc7e8c\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEA5:25D8:19CAB6:1E5EE4:5DDC7B56"
+    }
+  },
+  "uuid": "1279fb1b-4a2a-493a-b29a-96a060e4d3a5",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json
deleted file mode 100644
index 8b57c516b7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3-a4535a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a4535a71-fd6d-464c-a1e0-efa719b10411",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/ghcontent-ro/an-empty-file",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-a4535a71-fd6d-464c-a1e0-efa719b10411.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4929",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:13 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEA5:25D8:19CACE:1E5F69:5DDC7B56"
-    }
-  },
-  "uuid": "a4535a71-fd6d-464c-a1e0-efa719b10411",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json
new file mode 100644
index 0000000000..8ff0757d04
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "a4535a71-fd6d-464c-a1e0-efa719b10411",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest/contents/ghcontent-ro/an-empty-file",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_an-empty-file-3.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4929",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:13 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEA5:25D8:19CACE:1E5F69:5DDC7B56"
+    }
+  },
+  "uuid": "a4535a71-fd6d-464c-a1e0-efa719b10411",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json
deleted file mode 100644
index f46f6d1ed8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1-afa831.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "afa831d7-4300-49c9-8451-d76fecb86330",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-afa831d7-4300-49c9-8451-d76fecb86330.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEA5:25D8:19CA50:1E5ECF:5DDC7B55"
-    }
-  },
-  "uuid": "afa831d7-4300-49c9-8451-d76fecb86330",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1.json
new file mode 100644
index 0000000000..8ffe8eedb4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetEmptyFileContent/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "afa831d7-4300-49c9-8451-d76fecb86330",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEA5:25D8:19CA50:1E5ECF:5DDC7B55"
+    }
+  },
+  "uuid": "afa831d7-4300-49c9-8451-d76fecb86330",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/repos_github-api-test-org_ghcontentintegrationtest-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-59f0edb6-895f-402d-946f-77e7511a9a27.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-59f0edb6-895f-402d-946f-77e7511a9a27.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json
deleted file mode 100644
index 01c0c494ae..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-788adb.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "788adbe0-455b-4ba5-b05e-f485ea1874a7",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-788adbe0-455b-4ba5-b05e-f485ea1874a7.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4906",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4e6f5ec425012ce415fba01219503e19\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEB0:9734:178F:1EB8:5DDC7B5D"
-    }
-  },
-  "uuid": "788adbe0-455b-4ba5-b05e-f485ea1874a7",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..61b3939fde
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,51 @@
+{
+  "id": "788adbe0-455b-4ba5-b05e-f485ea1874a7",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4906",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4e6f5ec425012ce415fba01219503e19\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEB0:9734:178F:1EB8:5DDC7B5D"
+    }
+  },
+  "uuid": "788adbe0-455b-4ba5-b05e-f485ea1874a7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json
deleted file mode 100644
index a4c075ff60..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3-54fda8.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "54fda8c5-462b-477f-be65-918b40f75fa5",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-54fda8c5-462b-477f-be65-918b40f75fa5.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4905",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4e6f5ec425012ce415fba01219503e19\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEB0:9734:179A:1EDE:5DDC7B5E"
-    }
-  },
-  "uuid": "54fda8c5-462b-477f-be65-918b40f75fa5",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3.json
new file mode 100644
index 0000000000..9c4497605f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "54fda8c5-462b-477f-be65-918b40f75fa5",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-3.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4905",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4e6f5ec425012ce415fba01219503e19\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEB0:9734:179A:1EDE:5DDC7B5E"
+    }
+  },
+  "uuid": "54fda8c5-462b-477f-be65-918b40f75fa5",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-GHContentIntegrationTest-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4-3e4aa2.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/repos_github-api-test-org_ghcontentintegrationtest_contents_ghcontent-ro_a-file-with-content-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json
deleted file mode 100644
index f22a2937e2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1-59f0ed.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "59f0edb6-895f-402d-946f-77e7511a9a27",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-59f0edb6-895f-402d-946f-77e7511a9a27.json",
-    "headers": {
-      "Date": "Tue, 26 Nov 2019 01:09:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4910",
-      "X-RateLimit-Reset": "1574734142",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EEB0:9734:1774:1EB2:5DDC7B5D"
-    }
-  },
-  "uuid": "59f0edb6-895f-402d-946f-77e7511a9a27",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1.json
new file mode 100644
index 0000000000..71a14498b0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testGetFileContent/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "59f0edb6-895f-402d-946f-77e7511a9a27",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 26 Nov 2019 01:09:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1574734142",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"64a234e5bacdc505df16046a440645a9\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EEB0:9734:1774:1EB2:5DDC7B5D"
+    }
+  },
+  "uuid": "59f0edb6-895f-402d-946f-77e7511a9a27",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_ghcontentintegrationtest-558c17cf-aa4d-452c-8791-7b2f196ef7e1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_ghcontentintegrationtest-558c17cf-aa4d-452c-8791-7b2f196ef7e1.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong-7082490a-244f-4873-bdd9-de2dc4f78d54.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong-7082490a-244f-4873-bdd9-de2dc4f78d54.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-fb14970e-1231-44e3-9e36-9856335a1408.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-fb14970e-1231-44e3-9e36-9856335a1408.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/user-e335a3e3-5206-41d0-ae3f-e73676b9cf83.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/user-e335a3e3-5206-41d0-ae3f-e73676b9cf83.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-558c17.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-558c17.json
deleted file mode 100644
index 6e334cfbb0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-558c17.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "558c17cf-aa4d-452c-8791-7b2f196ef7e1",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-558c17cf-aa4d-452c-8791-7b2f196ef7e1.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:42:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1e430d4199aa33f3d4673fee6fee2709\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C989:1F58:E9F71A:11C8906:5DFD94A0"
-    }
-  },
-  "uuid": "558c17cf-aa4d-452c-8791-7b2f196ef7e1",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..006f39964f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "558c17cf-aa4d-452c-8791-7b2f196ef7e1",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:42:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1e430d4199aa33f3d4673fee6fee2709\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C989:1F58:E9F71A:11C8906:5DFD94A0"
+    }
+  },
+  "uuid": "558c17cf-aa4d-452c-8791-7b2f196ef7e1",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3-708249.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3-708249.json
deleted file mode 100644
index 0b87ce1459..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3-708249.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7082490a-244f-4873-bdd9-de2dc4f78d54",
-  "name": "repos_github-api-test-org_temp-testmimelong",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testMIMELong",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testmimelong-7082490a-244f-4873-bdd9-de2dc4f78d54.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:42:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4963",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70fd0b126fb45267b09e3b8201913a53\"",
-      "Last-Modified": "Sat, 21 Dec 2019 03:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C989:1F58:E9F874:11C8959:5DFD94A1"
-    }
-  },
-  "uuid": "7082490a-244f-4873-bdd9-de2dc4f78d54",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3.json
new file mode 100644
index 0000000000..71a0c7d0a5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "7082490a-244f-4873-bdd9-de2dc4f78d54",
+  "name": "repos_github-api-test-org_temp-testmimelong",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testMIMELong",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testmimelong-3.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:42:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4963",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70fd0b126fb45267b09e3b8201913a53\"",
+      "Last-Modified": "Sat, 21 Dec 2019 03:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C989:1F58:E9F874:11C8959:5DFD94A1"
+    }
+  },
+  "uuid": "7082490a-244f-4873-bdd9-de2dc4f78d54",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4-fb1497.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4-fb1497.json
deleted file mode 100644
index 0fcb995100..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4-fb1497.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "fb14970e-1231-44e3-9e36-9856335a1408",
-  "name": "repos_github-api-test-org_temp-testmimelong_contents_mime-longmd",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testMIMELong/contents/MIME-Long.md",
-    "method": "PUT",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"MIME-Long.md\",\"message\":\"Some commit msg\",\"content\":\"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3OA==\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-fb14970e-1231-44e3-9e36-9856335a1408.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:42:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"22277609adad7bed7001b1267022f175\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C989:1F58:E9F880:11C8B16:5DFD94A7"
-    }
-  },
-  "uuid": "fb14970e-1231-44e3-9e36-9856335a1408",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json
new file mode 100644
index 0000000000..b327b91009
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "fb14970e-1231-44e3-9e36-9856335a1408",
+  "name": "repos_github-api-test-org_temp-testmimelong_contents_mime-longmd",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testMIMELong/contents/MIME-Long.md",
+    "method": "PUT",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"MIME-Long.md\",\"message\":\"Some commit msg\",\"content\":\"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3OA==\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testmimelong_contents_mime-longmd-4.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:42:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"22277609adad7bed7001b1267022f175\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C989:1F58:E9F880:11C8B16:5DFD94A7"
+    }
+  },
+  "uuid": "fb14970e-1231-44e3-9e36-9856335a1408",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1-e335a3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1-e335a3.json
deleted file mode 100644
index c9272ebfba..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1-e335a3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e335a3e3-5206-41d0-ae3f-e73676b9cf83",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-e335a3e3-5206-41d0-ae3f-e73676b9cf83.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:42:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4370b3c906450f450e411f567ee839\"",
-      "Last-Modified": "Wed, 18 Dec 2019 01:26:55 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C989:1F58:E9F6D6:11C88FB:5DFD94A0"
-    }
-  },
-  "uuid": "e335a3e3-5206-41d0-ae3f-e73676b9cf83",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1.json
new file mode 100644
index 0000000000..9c5f362ffd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELong/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "e335a3e3-5206-41d0-ae3f-e73676b9cf83",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:42:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4370b3c906450f450e411f567ee839\"",
+      "Last-Modified": "Wed, 18 Dec 2019 01:26:55 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C989:1F58:E9F6D6:11C88FB:5DFD94A0"
+    }
+  },
+  "uuid": "e335a3e3-5206-41d0-ae3f-e73676b9cf83",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_ghcontentintegrationtest-9942833c-45f6-4900-b491-bc457756e658.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_ghcontentintegrationtest-9942833c-45f6-4900-b491-bc457756e658.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger-9160729e-acb8-4d03-95b8-dc0482236f2a.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger-9160729e-acb8-4d03-95b8-dc0482236f2a.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-1ff06594-1fa5-4715-8e13-036b87b43556.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-1ff06594-1fa5-4715-8e13-036b87b43556.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/user-1a0b1b14-7198-4fde-a559-64c0556a1aec.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/user-1a0b1b14-7198-4fde-a559-64c0556a1aec.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-994283.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-994283.json
deleted file mode 100644
index afba0cec28..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-994283.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9942833c-45f6-4900-b491-bc457756e658",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-9942833c-45f6-4900-b491-bc457756e658.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:44:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4953",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1e430d4199aa33f3d4673fee6fee2709\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C9A0:123F:168DE5:1BDB88:5DFD9509"
-    }
-  },
-  "uuid": "9942833c-45f6-4900-b491-bc457756e658",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..c8cd551970
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "9942833c-45f6-4900-b491-bc457756e658",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:44:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1e430d4199aa33f3d4673fee6fee2709\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C9A0:123F:168DE5:1BDB88:5DFD9509"
+    }
+  },
+  "uuid": "9942833c-45f6-4900-b491-bc457756e658",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3-916072.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3-916072.json
deleted file mode 100644
index 8ca0b2f818..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3-916072.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9160729e-acb8-4d03-95b8-dc0482236f2a",
-  "name": "repos_github-api-test-org_temp-testmimelonger",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testMIMELonger",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testmimelonger-9160729e-acb8-4d03-95b8-dc0482236f2a.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:44:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f6e32e5acd526da0a3542ec9e21bd334\"",
-      "Last-Modified": "Sat, 21 Dec 2019 03:44:14 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C9A0:123F:168E14:1BDB96:5DFD950A"
-    }
-  },
-  "uuid": "9160729e-acb8-4d03-95b8-dc0482236f2a",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3.json
new file mode 100644
index 0000000000..867ed4fe5b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "9160729e-acb8-4d03-95b8-dc0482236f2a",
+  "name": "repos_github-api-test-org_temp-testmimelonger",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testMIMELonger",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testmimelonger-3.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:44:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f6e32e5acd526da0a3542ec9e21bd334\"",
+      "Last-Modified": "Sat, 21 Dec 2019 03:44:14 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C9A0:123F:168E14:1BDB96:5DFD950A"
+    }
+  },
+  "uuid": "9160729e-acb8-4d03-95b8-dc0482236f2a",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4-1ff065.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4-1ff065.json
deleted file mode 100644
index bf31376faf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4-1ff065.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "1ff06594-1fa5-4715-8e13-036b87b43556",
-  "name": "repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testMIMELonger/contents/MIME-Long.md",
-    "method": "PUT",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"MIME-Long.md\",\"message\":\"Some commit msg\",\"content\":\"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkw\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-1ff06594-1fa5-4715-8e13-036b87b43556.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:44:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"e57c13fcb987d7bcd8f73234879affe4\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C9A0:123F:168E16:1BDBC7:5DFD9510"
-    }
-  },
-  "uuid": "1ff06594-1fa5-4715-8e13-036b87b43556",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json
new file mode 100644
index 0000000000..93cf07074d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "1ff06594-1fa5-4715-8e13-036b87b43556",
+  "name": "repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testMIMELonger/contents/MIME-Long.md",
+    "method": "PUT",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"MIME-Long.md\",\"message\":\"Some commit msg\",\"content\":\"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkw\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testmimelonger_contents_mime-longmd-4.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:44:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4948",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"e57c13fcb987d7bcd8f73234879affe4\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C9A0:123F:168E16:1BDBC7:5DFD9510"
+    }
+  },
+  "uuid": "1ff06594-1fa5-4715-8e13-036b87b43556",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1-1a0b1b.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1-1a0b1b.json
deleted file mode 100644
index b0c4f0acc2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1-1a0b1b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1a0b1b14-7198-4fde-a559-64c0556a1aec",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1a0b1b14-7198-4fde-a559-64c0556a1aec.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:44:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4957",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4370b3c906450f450e411f567ee839\"",
-      "Last-Modified": "Wed, 18 Dec 2019 01:26:55 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C9A0:123F:168DDA:1BDB85:5DFD9508"
-    }
-  },
-  "uuid": "1a0b1b14-7198-4fde-a559-64c0556a1aec",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1.json
new file mode 100644
index 0000000000..32a4061c8c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMELonger/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1a0b1b14-7198-4fde-a559-64c0556a1aec",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:44:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4957",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4370b3c906450f450e411f567ee839\"",
+      "Last-Modified": "Wed, 18 Dec 2019 01:26:55 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C9A0:123F:168DDA:1BDB85:5DFD9508"
+    }
+  },
+  "uuid": "1a0b1b14-7198-4fde-a559-64c0556a1aec",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_ghcontentintegrationtest-f60bd9fd-10cc-4488-b2ce-b618cac83ae2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_ghcontentintegrationtest-f60bd9fd-10cc-4488-b2ce-b618cac83ae2.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_ghcontentintegrationtest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall-41e8e5a0-d704-4832-87b2-8a5a89cce1a2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall-41e8e5a0-d704-4832-87b2-8a5a89cce1a2.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-931cbb72-6e12-4509-bfa6-612dbfaadac0.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-931cbb72-6e12-4509-bfa6-612dbfaadac0.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/user-b9d02cd3-311a-4d49-8de8-aa4220400616.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/user-b9d02cd3-311a-4d49-8de8-aa4220400616.json
rename to src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-f60bd9.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-f60bd9.json
deleted file mode 100644
index 0331bee67a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2-f60bd9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f60bd9fd-10cc-4488-b2ce-b618cac83ae2",
-  "name": "repos_github-api-test-org_ghcontentintegrationtest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-f60bd9fd-10cc-4488-b2ce-b618cac83ae2.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:41:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1e430d4199aa33f3d4673fee6fee2709\"",
-      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C977:4ACE:948C3A:B32669:5DFD9463"
-    }
-  },
-  "uuid": "f60bd9fd-10cc-4488-b2ce-b618cac83ae2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
new file mode 100644
index 0000000000..cafca9e69a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_ghcontentintegrationtest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f60bd9fd-10cc-4488-b2ce-b618cac83ae2",
+  "name": "repos_github-api-test-org_ghcontentintegrationtest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHContentIntegrationTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghcontentintegrationtest-2.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:41:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1e430d4199aa33f3d4673fee6fee2709\"",
+      "Last-Modified": "Tue, 26 Nov 2019 01:09:49 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C977:4ACE:948C3A:B32669:5DFD9463"
+    }
+  },
+  "uuid": "f60bd9fd-10cc-4488-b2ce-b618cac83ae2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3-41e8e5.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3-41e8e5.json
deleted file mode 100644
index 2fdda688ad..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3-41e8e5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "41e8e5a0-d704-4832-87b2-8a5a89cce1a2",
-  "name": "repos_github-api-test-org_temp-testmimesmall",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testMIMESmall",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testmimesmall-41e8e5a0-d704-4832-87b2-8a5a89cce1a2.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:41:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4977",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c557a0c20701919fce23174db79017f3\"",
-      "Last-Modified": "Sat, 21 Dec 2019 03:41:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C977:4ACE:948CFA:B326A5:5DFD9465"
-    }
-  },
-  "uuid": "41e8e5a0-d704-4832-87b2-8a5a89cce1a2",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3.json
new file mode 100644
index 0000000000..f50343f3ff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "41e8e5a0-d704-4832-87b2-8a5a89cce1a2",
+  "name": "repos_github-api-test-org_temp-testmimesmall",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testMIMESmall",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testmimesmall-3.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:41:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4977",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c557a0c20701919fce23174db79017f3\"",
+      "Last-Modified": "Sat, 21 Dec 2019 03:41:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C977:4ACE:948CFA:B326A5:5DFD9465"
+    }
+  },
+  "uuid": "41e8e5a0-d704-4832-87b2-8a5a89cce1a2",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4-931cbb.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4-931cbb.json
deleted file mode 100644
index 03387206fc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4-931cbb.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "931cbb72-6e12-4509-bfa6-612dbfaadac0",
-  "name": "repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testMIMESmall/contents/MIME-Small.md",
-    "method": "PUT",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"MIME-Small.md\",\"message\":\"Some commit msg\",\"content\":\"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-931cbb72-6e12-4509-bfa6-612dbfaadac0.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:41:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"3365fc5e9b238559992839bdabae9db1\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C977:4ACE:948D01:B32783:5DFD946A"
-    }
-  },
-  "uuid": "931cbb72-6e12-4509-bfa6-612dbfaadac0",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json
new file mode 100644
index 0000000000..6350048700
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "931cbb72-6e12-4509-bfa6-612dbfaadac0",
+  "name": "repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testMIMESmall/contents/MIME-Small.md",
+    "method": "PUT",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"MIME-Small.md\",\"message\":\"Some commit msg\",\"content\":\"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testmimesmall_contents_mime-smallmd-4.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:41:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4976",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"3365fc5e9b238559992839bdabae9db1\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C977:4ACE:948D01:B32783:5DFD946A"
+    }
+  },
+  "uuid": "931cbb72-6e12-4509-bfa6-612dbfaadac0",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1-b9d02c.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1-b9d02c.json
deleted file mode 100644
index b94e3839e5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1-b9d02c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b9d02cd3-311a-4d49-8de8-aa4220400616",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b9d02cd3-311a-4d49-8de8-aa4220400616.json",
-    "headers": {
-      "Date": "Sat, 21 Dec 2019 03:41:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4985",
-      "X-RateLimit-Reset": "1576903221",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4370b3c906450f450e411f567ee839\"",
-      "Last-Modified": "Wed, 18 Dec 2019 01:26:55 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C977:4ACE:948C05:B32660:5DFD9463"
-    }
-  },
-  "uuid": "b9d02cd3-311a-4d49-8de8-aa4220400616",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1.json
new file mode 100644
index 0000000000..97ef235683
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHContentIntegrationTest/wiremock/testMIMESmall/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b9d02cd3-311a-4d49-8de8-aa4220400616",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 21 Dec 2019 03:41:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4985",
+      "X-RateLimit-Reset": "1576903221",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4370b3c906450f450e411f567ee839\"",
+      "Last-Modified": "Wed, 18 Dec 2019 01:26:55 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C977:4ACE:948C05:B32660:5DFD9463"
+    }
+  },
+  "uuid": "b9d02cd3-311a-4d49-8de8-aa4220400616",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/orgs_github-api-test-org-4def936c-47fd-43aa-851a-f9dd06f236b5.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/orgs_github-api-test-org-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/orgs_github-api-test-org-4def936c-47fd-43aa-851a-f9dd06f236b5.json
rename to src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/orgs_github-api-test-org-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api-a1a9ff0a-2e37-4803-a9de-fb8fffd45f41.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api-a1a9ff0a-2e37-4803-a9de-fb8fffd45f41.json
rename to src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api_deployments_178653229-d1d9d992-25e4-4a4b-8710-5b0c57e99a64.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api_deployments_178653229-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api_deployments_178653229-d1d9d992-25e4-4a4b-8710-5b0c57e99a64.json
rename to src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/__files/repos_github-api-test-org_github-api_deployments_178653229-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1-4def93.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1-4def93.json
deleted file mode 100644
index acd6832526..0000000000
--- a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1-4def93.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "4def936c-47fd-43aa-851a-f9dd06f236b5",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4def936c-47fd-43aa-851a-f9dd06f236b5.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 00:11:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "1572397284",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4342e0e7004c1a50986c767513fe857d\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DFCA:4866:E50AD:103D70:5DB8D541"
-    }
-  },
-  "uuid": "4def936c-47fd-43aa-851a-f9dd06f236b5",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1.json
new file mode 100644
index 0000000000..c5a58023ad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/orgs_github-api-test-org-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "4def936c-47fd-43aa-851a-f9dd06f236b5",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-1.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 00:11:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "1572397284",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4342e0e7004c1a50986c767513fe857d\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DFCA:4866:E50AD:103D70:5DB8D541"
+    }
+  },
+  "uuid": "4def936c-47fd-43aa-851a-f9dd06f236b5",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2-a1a9ff.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2-a1a9ff.json
deleted file mode 100644
index 9beec61296..0000000000
--- a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2-a1a9ff.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "a1a9ff0a-2e37-4803-a9de-fb8fffd45f41",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-a1a9ff0a-2e37-4803-a9de-fb8fffd45f41.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 00:11:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "1572397284",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4ef7d9ee7bc7f4f32000eb0720da5bf1\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DFCA:4866:E50D8:103D81:5DB8D542"
-    }
-  },
-  "uuid": "a1a9ff0a-2e37-4803-a9de-fb8fffd45f41",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2.json
new file mode 100644
index 0000000000..18168a1141
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "a1a9ff0a-2e37-4803-a9de-fb8fffd45f41",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-2.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 00:11:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "1572397284",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4ef7d9ee7bc7f4f32000eb0720da5bf1\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DFCA:4866:E50D8:103D81:5DB8D542"
+    }
+  },
+  "uuid": "a1a9ff0a-2e37-4803-a9de-fb8fffd45f41",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3-d1d9d9.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3-d1d9d9.json
deleted file mode 100644
index f7554eed0d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3-d1d9d9.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "d1d9d992-25e4-4a4b-8710-5b0c57e99a64",
-  "name": "repos_github-api-test-org_github-api_deployments_178653229",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/deployments/178653229",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_deployments_178653229-d1d9d992-25e4-4a4b-8710-5b0c57e99a64.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 00:11:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "1572397284",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e1b3c1f524645e959b25405131fba656\"",
-      "Last-Modified": "Wed, 30 Oct 2019 00:03:34 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DFCA:4866:E50EA:103DAF:5DB8D543"
-    }
-  },
-  "uuid": "d1d9d992-25e4-4a4b-8710-5b0c57e99a64",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3.json b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3.json
new file mode 100644
index 0000000000..26aab4095c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHDeploymentTest/wiremock/testGetDeploymentById/mappings/repos_github-api-test-org_github-api_deployments_178653229-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "d1d9d992-25e4-4a4b-8710-5b0c57e99a64",
+  "name": "repos_github-api-test-org_github-api_deployments_178653229",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/deployments/178653229",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_deployments_178653229-3.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 00:11:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "1572397284",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e1b3c1f524645e959b25405131fba656\"",
+      "Last-Modified": "Wed, 30 Oct 2019 00:03:34 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DFCA:4866:E50EA:103DAF:5DB8D543"
+    }
+  },
+  "uuid": "d1d9d992-25e4-4a4b-8710-5b0c57e99a64",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/gists_9903708-c3067d66-2bb0-4af7-b7d4-98032571c5d0.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/gists_9903708-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/gists_9903708-c3067d66-2bb0-4af7-b7d4-98032571c5d0.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/gists_9903708-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/user-9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/user-9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2-c3067d.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2-c3067d.json
deleted file mode 100644
index e2b4d61f42..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2-c3067d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c3067d66-2bb0-4af7-b7d4-98032571c5d0",
-  "name": "gists_9903708",
-  "request": {
-    "url": "/gists/9903708",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "gists_9903708-c3067d66-2bb0-4af7-b7d4-98032571c5d0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4797",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b6d45b73ecf4a7c47e2af95f762390c6\"",
-      "Last-Modified": "Sun, 08 Sep 2019 06:46:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD51:4FAD:500EFE:5EB1D0:5D74A40F"
-    }
-  },
-  "uuid": "c3067d66-2bb0-4af7-b7d4-98032571c5d0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2.json
new file mode 100644
index 0000000000..992ebe2da2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/gists_9903708-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "c3067d66-2bb0-4af7-b7d4-98032571c5d0",
+  "name": "gists_9903708",
+  "request": {
+    "url": "/gists/9903708",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "gists_9903708-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4797",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b6d45b73ecf4a7c47e2af95f762390c6\"",
+      "Last-Modified": "Sun, 08 Sep 2019 06:46:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD51:4FAD:500EFE:5EB1D0:5D74A40F"
+    }
+  },
+  "uuid": "c3067d66-2bb0-4af7-b7d4-98032571c5d0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1-9226d6.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1-9226d6.json
deleted file mode 100644
index 758b1bec44..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1-9226d6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4798",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD51:4FAD:500EFB:5EB1CD:5D74A40F"
-    }
-  },
-  "uuid": "9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1.json
new file mode 100644
index 0000000000..61ee5ca9a5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/gistFile/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4798",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD51:4FAD:500EFB:5EB1CD:5D74A40F"
+    }
+  },
+  "uuid": "9226d6ed-a52d-4b08-9402-f1cfc2dbf0e1",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/gists-2f93eec6-32ad-4c3d-a7bf-33a134d16dbe.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/gists-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/gists-2f93eec6-32ad-4c3d-a7bf-33a134d16dbe.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/gists-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/user-3380f859-169e-41b0-9a8a-aa66277dfb8b.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/user-3380f859-169e-41b0-9a8a-aa66277dfb8b.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2-2f93ee.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2-2f93ee.json
deleted file mode 100644
index 78cb5a2fbb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2-2f93ee.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "2f93eec6-32ad-4c3d-a7bf-33a134d16dbe",
-  "name": "gists",
-  "request": {
-    "url": "/gists",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"public\":false,\"description\":\"Test Gist\",\"files\":{\"abc.txt\":{\"content\":\"abc\"},\"def.txt\":{\"content\":\"def\"}}}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "gists-2f93eec6-32ad-4c3d-a7bf-33a134d16dbe.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4800",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"32bd93e7c792880260a7f86efe7fa182\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/gists/9faa55cd67b21a789bb44e34e5e41f72",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD4E:40BC:96FAEF:B22CDC:5D74A40D"
-    }
-  },
-  "uuid": "2f93eec6-32ad-4c3d-a7bf-33a134d16dbe",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2.json
new file mode 100644
index 0000000000..98027c3a76
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists-2.json
@@ -0,0 +1,55 @@
+{
+  "id": "2f93eec6-32ad-4c3d-a7bf-33a134d16dbe",
+  "name": "gists",
+  "request": {
+    "url": "/gists",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"public\":false,\"description\":\"Test Gist\",\"files\":{\"abc.txt\":{\"content\":\"abc\"},\"def.txt\":{\"content\":\"def\"}}}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "gists-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4800",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"32bd93e7c792880260a7f86efe7fa182\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/gists/9faa55cd67b21a789bb44e34e5e41f72",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD4E:40BC:96FAEF:B22CDC:5D74A40D"
+    }
+  },
+  "uuid": "2f93eec6-32ad-4c3d-a7bf-33a134d16dbe",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists_9faa55cd67b21a789bb44e34e5e41f72-3-26c314.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists_9faa55cd67b21a789bb44e34e5e41f72-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists_9faa55cd67b21a789bb44e34e5e41f72-3-26c314.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/gists_9faa55cd67b21a789bb44e34e5e41f72-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1-3380f8.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1-3380f8.json
deleted file mode 100644
index 952183627f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1-3380f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3380f859-169e-41b0-9a8a-aa66277dfb8b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3380f859-169e-41b0-9a8a-aa66277dfb8b.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4801",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD4E:40BC:96FAD6:B22CD5:5D74A40D"
-    }
-  },
-  "uuid": "3380f859-169e-41b0-9a8a-aa66277dfb8b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1.json
new file mode 100644
index 0000000000..b12f897ad2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/lifecycleTest/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "3380f859-169e-41b0-9a8a-aa66277dfb8b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4801",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD4E:40BC:96FAD6:B22CD5:5D74A40D"
+    }
+  },
+  "uuid": "3380f859-169e-41b0-9a8a-aa66277dfb8b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708-ab2c9d06-edf6-4875-b402-7c99a529b19a.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708-ab2c9d06-edf6-4875-b402-7c99a529b19a.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-42d6e404-71e3-42cc-b415-f42dfab9d45e.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-42d6e404-71e3-42cc-b415-f42dfab9d45e.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-992bf599-2e87-4fb0-b610-7c2e1fc00398.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-992bf599-2e87-4fb0-b610-7c2e1fc00398.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/gists_9903708_forks-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/user-07500425-69d3-4dd0-8519-628a92aa66c5.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/user-07500425-69d3-4dd0-8519-628a92aa66c5.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_8edf855833a05ce8730d609fe8bd803a-9-e0907c.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_8edf855833a05ce8730d609fe8bd803a-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_8edf855833a05ce8730d609fe8bd803a-9-e0907c.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_8edf855833a05ce8730d609fe8bd803a-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2-ab2c9d.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2-ab2c9d.json
deleted file mode 100644
index 4e83707f5f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2-ab2c9d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ab2c9d06-edf6-4875-b402-7c99a529b19a",
-  "name": "gists_9903708",
-  "request": {
-    "url": "/gists/9903708",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "gists_9903708-ab2c9d06-edf6-4875-b402-7c99a529b19a.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4795",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b6d45b73ecf4a7c47e2af95f762390c6\"",
-      "Last-Modified": "Sun, 08 Sep 2019 06:46:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD54:0A32:A0C2A6:BD2AFD:5D74A410"
-    }
-  },
-  "uuid": "ab2c9d06-edf6-4875-b402-7c99a529b19a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2.json
new file mode 100644
index 0000000000..aebe2d38d7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "ab2c9d06-edf6-4875-b402-7c99a529b19a",
+  "name": "gists_9903708",
+  "request": {
+    "url": "/gists/9903708",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "gists_9903708-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4795",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b6d45b73ecf4a7c47e2af95f762390c6\"",
+      "Last-Modified": "Sun, 08 Sep 2019 06:46:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD54:0A32:A0C2A6:BD2AFD:5D74A410"
+    }
+  },
+  "uuid": "ab2c9d06-edf6-4875-b402-7c99a529b19a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7-42d6e4.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7-42d6e4.json
deleted file mode 100644
index ad87cdedfd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7-42d6e4.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "42d6e404-71e3-42cc-b415-f42dfab9d45e",
-  "name": "gists_9903708_forks",
-  "request": {
-    "url": "/gists/9903708/forks",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "gists_9903708_forks-42d6e404-71e3-42cc-b415-f42dfab9d45e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4790",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"a2606a3b1480768d9a5d3823fa388bfb\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/gists/8edf855833a05ce8730d609fe8bd803a",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD54:0A32:A0C2E2:BD2B41:5D74A411"
-    }
-  },
-  "uuid": "42d6e404-71e3-42cc-b415-f42dfab9d45e",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7.json
new file mode 100644
index 0000000000..046d9c8f2a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-7.json
@@ -0,0 +1,55 @@
+{
+  "id": "42d6e404-71e3-42cc-b415-f42dfab9d45e",
+  "name": "gists_9903708_forks",
+  "request": {
+    "url": "/gists/9903708/forks",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "gists_9903708_forks-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4790",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"a2606a3b1480768d9a5d3823fa388bfb\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/gists/8edf855833a05ce8730d609fe8bd803a",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD54:0A32:A0C2E2:BD2B41:5D74A411"
+    }
+  },
+  "uuid": "42d6e404-71e3-42cc-b415-f42dfab9d45e",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8-992bf5.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8-992bf5.json
deleted file mode 100644
index cd8bfaf279..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8-992bf5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "992bf599-2e87-4fb0-b610-7c2e1fc00398",
-  "name": "gists_9903708_forks",
-  "request": {
-    "url": "/gists/9903708/forks",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "gists_9903708_forks-992bf599-2e87-4fb0-b610-7c2e1fc00398.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4789",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cb5d2523020ddf0a3951340b70a76064\"",
-      "Last-Modified": "Sun, 08 Sep 2019 06:47:48 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD54:0A32:A0C3A6:BD2C27:5D74A414"
-    }
-  },
-  "uuid": "992bf599-2e87-4fb0-b610-7c2e1fc00398",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8.json
new file mode 100644
index 0000000000..7c1014ce43
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_forks-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "992bf599-2e87-4fb0-b610-7c2e1fc00398",
+  "name": "gists_9903708_forks",
+  "request": {
+    "url": "/gists/9903708/forks",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "gists_9903708_forks-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4789",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cb5d2523020ddf0a3951340b70a76064\"",
+      "Last-Modified": "Sun, 08 Sep 2019 06:47:48 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD54:0A32:A0C3A6:BD2C27:5D74A414"
+    }
+  },
+  "uuid": "992bf599-2e87-4fb0-b610-7c2e1fc00398",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-3-dc6fd4.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-3-dc6fd4.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-4-680201.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-4-680201.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-5-c7d88c.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-5-c7d88c.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-6-584dc0.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-6-584dc0.json
rename to src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/gists_9903708_star-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1-075004.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1-075004.json
deleted file mode 100644
index 001dd061c3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1-075004.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "07500425-69d3-4dd0-8519-628a92aa66c5",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-07500425-69d3-4dd0-8519-628a92aa66c5.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 06:47:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4796",
-      "X-RateLimit-Reset": "1567926046",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD54:0A32:A0C29C:BD2AF4:5D74A410"
-    }
-  },
-  "uuid": "07500425-69d3-4dd0-8519-628a92aa66c5",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1.json
new file mode 100644
index 0000000000..612350c36f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistTest/wiremock/starTest/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "07500425-69d3-4dd0-8519-628a92aa66c5",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 06:47:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4796",
+      "X-RateLimit-Reset": "1567926046",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD54:0A32:A0C29C:BD2AF4:5D74A410"
+    }
+  },
+  "uuid": "07500425-69d3-4dd0-8519-628a92aa66c5",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists-fde9aa5a-83fc-41d8-b556-16335859de73.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists-fde9aa5a-83fc-41d8-b556-16335859de73.json
rename to src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists_209fef72c25fe4b3f673437603ab6d5d-d3ef0c04-12e0-4815-a871-ab7a397b00d7.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists_209fef72c25fe4b3f673437603ab6d5d-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists_209fef72c25fe4b3f673437603ab6d5d-d3ef0c04-12e0-4815-a871-ab7a397b00d7.json
rename to src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/__files/gists_209fef72c25fe4b3f673437603ab6d5d-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1-fde9aa.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1-fde9aa.json
deleted file mode 100644
index 1e9208e089..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1-fde9aa.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "id": "fde9aa5a-83fc-41d8-b556-16335859de73",
-  "name": "gists",
-  "request": {
-    "url": "/gists",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"public\":true,\"description\":\"Test for the API\",\"files\":{\"unmodified.txt\":{\"content\":\"Should be unmodified\"},\"rename-me.py\":{\"content\":\"print 'hello'\"},\"update-me.txt\":{\"content\":\"To be updated\"}}}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "gists-fde9aa5a-83fc-41d8-b556-16335859de73.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 18:06:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "1570647617",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"f60e43f46988893f64e50f632c072e41\"",
-      "Location": "https://api.github.com/gists/209fef72c25fe4b3f673437603ab6d5d",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "AF56:13F4:1234663:150EFE0:5D9E21AD"
-    }
-  },
-  "uuid": "fde9aa5a-83fc-41d8-b556-16335859de73",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1.json
new file mode 100644
index 0000000000..5a4857ffd7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists-1.json
@@ -0,0 +1,53 @@
+{
+  "id": "fde9aa5a-83fc-41d8-b556-16335859de73",
+  "name": "gists",
+  "request": {
+    "url": "/gists",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"public\":true,\"description\":\"Test for the API\",\"files\":{\"unmodified.txt\":{\"content\":\"Should be unmodified\"},\"rename-me.py\":{\"content\":\"print 'hello'\"},\"update-me.txt\":{\"content\":\"To be updated\"}}}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "gists-1.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 18:06:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1570647617",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"f60e43f46988893f64e50f632c072e41\"",
+      "Location": "https://api.github.com/gists/209fef72c25fe4b3f673437603ab6d5d",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "AF56:13F4:1234663:150EFE0:5D9E21AD"
+    }
+  },
+  "uuid": "fde9aa5a-83fc-41d8-b556-16335859de73",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2-d3ef0c.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2-d3ef0c.json
deleted file mode 100644
index dab45ac90f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2-d3ef0c.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "d3ef0c04-12e0-4815-a871-ab7a397b00d7",
-  "name": "gists_209fef72c25fe4b3f673437603ab6d5d",
-  "request": {
-    "url": "/gists/209fef72c25fe4b3f673437603ab6d5d",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"Description updated by API\",\"files\":{\"new-file.txt\":{\"content\":\"Added by updater\"},\"rename-me.py\":{\"filename\":\"renamed.py\"},\"update-me.txt\":{\"content\":\"Content updated by API\"}}}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "gists_209fef72c25fe4b3f673437603ab6d5d-d3ef0c04-12e0-4815-a871-ab7a397b00d7.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 18:06:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4985",
-      "X-RateLimit-Reset": "1570647617",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"428bc6a3a9c8f9c26b9023cf8ff0ac9f\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "AF56:13F4:1234695:150F007:5D9E21AE"
-    }
-  },
-  "uuid": "d3ef0c04-12e0-4815-a871-ab7a397b00d7",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2.json
new file mode 100644
index 0000000000..d329d76d8a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-2.json
@@ -0,0 +1,52 @@
+{
+  "id": "d3ef0c04-12e0-4815-a871-ab7a397b00d7",
+  "name": "gists_209fef72c25fe4b3f673437603ab6d5d",
+  "request": {
+    "url": "/gists/209fef72c25fe4b3f673437603ab6d5d",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"Description updated by API\",\"files\":{\"new-file.txt\":{\"content\":\"Added by updater\"},\"rename-me.py\":{\"filename\":\"renamed.py\"},\"update-me.txt\":{\"content\":\"Content updated by API\"}}}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "gists_209fef72c25fe4b3f673437603ab6d5d-2.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 18:06:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4985",
+      "X-RateLimit-Reset": "1570647617",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"428bc6a3a9c8f9c26b9023cf8ff0ac9f\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "AF56:13F4:1234695:150F007:5D9E21AE"
+    }
+  },
+  "uuid": "d3ef0c04-12e0-4815-a871-ab7a397b00d7",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-3-94cd51.json b/src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-3-94cd51.json
rename to src/test/resources/org/kohsuke/github/GHGistUpdaterTest/wiremock/testGitUpdater/mappings/gists_209fef72c25fe4b3f673437603ab6d5d-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/orgs_github-api-test-org-0974905b-3de8-4061-bf78-6c18b9b91f54.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/orgs_github-api-test-org-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/orgs_github-api-test-org-0974905b-3de8-4061-bf78-6c18b9b91f54.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/orgs_github-api-test-org-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api-ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api-ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues-218efdaf-b6d8-4161-935b-58bb1ab4d9fb.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues-218efdaf-b6d8-4161-935b-58bb1ab4d9fb.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-9895867a-152d-425a-85ab-b7557241c309.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-9895867a-152d-425a-85ab-b7557241c309.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-450e6f09-ae2a-4870-a24d-f7620a437891.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-450e6f09-ae2a-4870-a24d-f7620a437891.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313_events-ef9890e7-cc75-4757-afba-42fc12908cd9.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313_events-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313_events-ef9890e7-cc75-4757-afba-42fc12908cd9.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_313_events-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_events_2704815753-306d4048-2cef-4339-aae4-e03195f651e4.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_events_2704815753-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_events_2704815753-306d4048-2cef-4339-aae4-e03195f651e4.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/__files/repos_github-api-test-org_github-api_issues_events_2704815753-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6-097490.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6-097490.json
deleted file mode 100644
index be803097ab..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6-097490.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "0974905b-3de8-4061-bf78-6c18b9b91f54",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-0974905b-3de8-4061-bf78-6c18b9b91f54.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4342e0e7004c1a50986c767513fe857d\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:6C54:15E531:196CC3:5D9FF818"
-    }
-  },
-  "uuid": "0974905b-3de8-4061-bf78-6c18b9b91f54",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6.json
new file mode 100644
index 0000000000..aaaafb683d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/orgs_github-api-test-org-6.json
@@ -0,0 +1,46 @@
+{
+  "id": "0974905b-3de8-4061-bf78-6c18b9b91f54",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-6.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4342e0e7004c1a50986c767513fe857d\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:6C54:15E531:196CC3:5D9FF818"
+    }
+  },
+  "uuid": "0974905b-3de8-4061-bf78-6c18b9b91f54",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7-ef3199.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7-ef3199.json
deleted file mode 100644
index 769f5c4e08..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7-ef3199.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4965",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"372f82a1e3bde8ceaacf16c227e5ca93\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:6C54:15E53F:196CD5:5D9FF818"
-    }
-  },
-  "uuid": "ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..65a35d921d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,46 @@
+{
+  "id": "ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4965",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"372f82a1e3bde8ceaacf16c227e5ca93\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:6C54:15E53F:196CD5:5D9FF818"
+    }
+  },
+  "uuid": "ef3199ce-5e1b-4d47-ae87-ca3fe49a8dc6",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5-218efd.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5-218efd.json
deleted file mode 100644
index a9749db4ef..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5-218efd.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "id": "218efdaf-b6d8-4161-935b-58bb1ab4d9fb",
-  "name": "repos_github-api-test-org_github-api_issues",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"assignees\":[],\"title\":\"Test from the API\",\"labels\":[]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues-218efdaf-b6d8-4161-935b-58bb1ab4d9fb.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:30:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"e1ef249243a0702886c04cdaa9aed9f7\"",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/issues/313",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:5841:162B1F:19A693:5D9FF74A"
-    }
-  },
-  "uuid": "218efdaf-b6d8-4161-935b-58bb1ab4d9fb",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5.json
new file mode 100644
index 0000000000..3aa33fe034
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues-5.json
@@ -0,0 +1,53 @@
+{
+  "id": "218efdaf-b6d8-4161-935b-58bb1ab4d9fb",
+  "name": "repos_github-api-test-org_github-api_issues",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"assignees\":[],\"title\":\"Test from the API\",\"labels\":[]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues-5.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:30:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"e1ef249243a0702886c04cdaa9aed9f7\"",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/issues/313",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:5841:162B1F:19A693:5D9FF74A"
+    }
+  },
+  "uuid": "218efdaf-b6d8-4161-935b-58bb1ab4d9fb",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6-989586.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6-989586.json
deleted file mode 100644
index 267aae4084..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6-989586.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "9895867a-152d-425a-85ab-b7557241c309",
-  "name": "repos_github-api-test-org_github-api_issues_313",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/313",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"labels\":[\"test-label\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_313-9895867a-152d-425a-85ab-b7557241c309.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:30:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"156824107235f2d1bc92a324caca92d3\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:5841:162B43:19A6B5:5D9FF74B"
-    }
-  },
-  "uuid": "9895867a-152d-425a-85ab-b7557241c309",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6.json
new file mode 100644
index 0000000000..7283f954fd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-6.json
@@ -0,0 +1,52 @@
+{
+  "id": "9895867a-152d-425a-85ab-b7557241c309",
+  "name": "repos_github-api-test-org_github-api_issues_313",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/313",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"labels\":[\"test-label\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_313-6.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:30:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"156824107235f2d1bc92a324caca92d3\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:5841:162B43:19A6B5:5D9FF74B"
+    }
+  },
+  "uuid": "9895867a-152d-425a-85ab-b7557241c309",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9-450e6f.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9-450e6f.json
deleted file mode 100644
index f0f5c0a7aa..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9-450e6f.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "450e6f09-ae2a-4870-a24d-f7620a437891",
-  "name": "repos_github-api-test-org_github-api_issues_313",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/313",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_313-450e6f09-ae2a-4870-a24d-f7620a437891.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:30:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4983",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fbb10a2c4f764898914d634928494d25\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:5841:162B75:19A6FB:5D9FF74C"
-    }
-  },
-  "uuid": "450e6f09-ae2a-4870-a24d-f7620a437891",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9.json
new file mode 100644
index 0000000000..7665ddb1f9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313-9.json
@@ -0,0 +1,52 @@
+{
+  "id": "450e6f09-ae2a-4870-a24d-f7620a437891",
+  "name": "repos_github-api-test-org_github-api_issues_313",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/313",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_313-9.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:30:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4983",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fbb10a2c4f764898914d634928494d25\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:5841:162B75:19A6FB:5D9FF74C"
+    }
+  },
+  "uuid": "450e6f09-ae2a-4870-a24d-f7620a437891",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7-ef9890.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7-ef9890.json
deleted file mode 100644
index 779e741afd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7-ef9890.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "ef9890e7-cc75-4757-afba-42fc12908cd9",
-  "name": "repos_github-api-test-org_github-api_issues_313_events",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/313/events",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_313_events-ef9890e7-cc75-4757-afba-42fc12908cd9.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:30:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4985",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"36e3ee1bd95ef214115e90c88db267ac\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:5841:162B53:19A6D1:5D9FF74B"
-    }
-  },
-  "uuid": "ef9890e7-cc75-4757-afba-42fc12908cd9",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7.json
new file mode 100644
index 0000000000..ba23aff2cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_313_events-7.json
@@ -0,0 +1,45 @@
+{
+  "id": "ef9890e7-cc75-4757-afba-42fc12908cd9",
+  "name": "repos_github-api-test-org_github-api_issues_313_events",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/313/events",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_313_events-7.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:30:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4985",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"36e3ee1bd95ef214115e90c88db267ac\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:5841:162B53:19A6D1:5D9FF74B"
+    }
+  },
+  "uuid": "ef9890e7-cc75-4757-afba-42fc12908cd9",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8-306d40.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8-306d40.json
deleted file mode 100644
index b28f917a4d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8-306d40.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "306d4048-2cef-4339-aae4-e03195f651e4",
-  "name": "repos_github-api-test-org_github-api_issues_events_2704815753",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/events/2704815753",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_events_2704815753-306d4048-2cef-4339-aae4-e03195f651e4.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:30:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4984",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"11ac613d699eae4c0ed7856f256d2f3d\"",
-      "Last-Modified": "Fri, 11 Oct 2019 03:30:19 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C425:5841:162B67:19A6E7:5D9FF74C"
-    }
-  },
-  "uuid": "306d4048-2cef-4339-aae4-e03195f651e4",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8.json
new file mode 100644
index 0000000000..06bd81738c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testEventsForSingleIssue/mappings/repos_github-api-test-org_github-api_issues_events_2704815753-8.json
@@ -0,0 +1,46 @@
+{
+  "id": "306d4048-2cef-4339-aae4-e03195f651e4",
+  "name": "repos_github-api-test-org_github-api_issues_events_2704815753",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/events/2704815753",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_events_2704815753-8.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:30:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4984",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"11ac613d699eae4c0ed7856f256d2f3d\"",
+      "Last-Modified": "Fri, 11 Oct 2019 03:30:19 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C425:5841:162B67:19A6E7:5D9FF74C"
+    }
+  },
+  "uuid": "306d4048-2cef-4339-aae4-e03195f651e4",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/orgs_github-api-test-org-b27b8752-74a5-4f0d-8d9c-483cb31d4178.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/orgs_github-api-test-org-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/orgs_github-api-test-org-b27b8752-74a5-4f0d-8d9c-483cb31d4178.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/orgs_github-api-test-org-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api-2afea771-4bdb-4e32-b0ba-e72ed286f6c2.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api-2afea771-4bdb-4e32-b0ba-e72ed286f6c2.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api_issues_events-d6129252-9f48-4380-babb-cc06baa4234e.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api_issues_events-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api_issues_events-d6129252-9f48-4380-babb-cc06baa4234e.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repos_github-api-test-org_github-api_issues_events-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-83c7abdb-5f08-4826-9313-decbfa7b2531.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-83c7abdb-5f08-4826-9313-decbfa7b2531.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-6f0d6963-5006-4dba-b11b-a0408d0f798f.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-6f0d6963-5006-4dba-b11b-a0408d0f798f.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-208a37ec-cb3d-4d4e-b27f-f6df770111b3.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-208a37ec-cb3d-4d4e-b27f-f6df770111b3.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-94dd8eff-b6f3-4003-89c9-c97721354a77.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-94dd8eff-b6f3-4003-89c9-c97721354a77.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-14.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-5f55d936-4d74-4c99-bc0d-f3c3a90dd81a.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-5f55d936-4d74-4c99-bc0d-f3c3a90dd81a.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-15.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-4917724b-b110-4549-81b5-c329a13c467a.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-4917724b-b110-4549-81b5-c329a13c467a.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-16.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-2b6f606b-278c-47b2-99ff-9036f43b0f68.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-2b6f606b-278c-47b2-99ff-9036f43b0f68.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-72a13002-acc3-4c49-a916-daaf249874b5.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-72a13002-acc3-4c49-a916-daaf249874b5.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-9c193fd6-e6f6-4949-8414-cf031e70f82e.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-9c193fd6-e6f6-4949-8414-cf031e70f82e.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-654e008f-d77e-4339-957e-f2bdfcab904b.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-654e008f-d77e-4339-957e-f2bdfcab904b.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-71d7968e-586e-4120-81db-eea6f1aca2f0.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-71d7968e-586e-4120-81db-eea6f1aca2f0.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-28692783-a6a7-432a-bae1-15bcb4e48175.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-28692783-a6a7-432a-bae1-15bcb4e48175.json
rename to src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/__files/repositories_206888201_issues_events-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1-b27b87.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1-b27b87.json
deleted file mode 100644
index 5a0257d43d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1-b27b87.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "b27b8752-74a5-4f0d-8d9c-483cb31d4178",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b27b8752-74a5-4f0d-8d9c-483cb31d4178.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4982",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4342e0e7004c1a50986c767513fe857d\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D91A:194D65:5D9FF80D"
-    }
-  },
-  "uuid": "b27b8752-74a5-4f0d-8d9c-483cb31d4178",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1.json
new file mode 100644
index 0000000000..d35bf60577
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/orgs_github-api-test-org-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "b27b8752-74a5-4f0d-8d9c-483cb31d4178",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-1.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4982",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4342e0e7004c1a50986c767513fe857d\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D91A:194D65:5D9FF80D"
+    }
+  },
+  "uuid": "b27b8752-74a5-4f0d-8d9c-483cb31d4178",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2-2afea7.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2-2afea7.json
deleted file mode 100644
index b927aeb78c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2-2afea7.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "2afea771-4bdb-4e32-b0ba-e72ed286f6c2",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-2afea771-4bdb-4e32-b0ba-e72ed286f6c2.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"372f82a1e3bde8ceaacf16c227e5ca93\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D943:194D77:5D9FF80D"
-    }
-  },
-  "uuid": "2afea771-4bdb-4e32-b0ba-e72ed286f6c2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2.json
new file mode 100644
index 0000000000..46e8a938a1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "2afea771-4bdb-4e32-b0ba-e72ed286f6c2",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"372f82a1e3bde8ceaacf16c227e5ca93\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D943:194D77:5D9FF80D"
+    }
+  },
+  "uuid": "2afea771-4bdb-4e32-b0ba-e72ed286f6c2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3-d61292.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3-d61292.json
deleted file mode 100644
index 806e810ef9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3-d61292.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "d6129252-9f48-4380-babb-cc06baa4234e",
-  "name": "repos_github-api-test-org_github-api_issues_events",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/events",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_events-d6129252-9f48-4380-babb-cc06baa4234e.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"092fd69b20562cd35fb3c435ea1c0031\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D95C:194DAC:5D9FF80E",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=2>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\""
-    }
-  },
-  "uuid": "d6129252-9f48-4380-babb-cc06baa4234e",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3.json
new file mode 100644
index 0000000000..fd14122c96
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repos_github-api-test-org_github-api_issues_events-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "d6129252-9f48-4380-babb-cc06baa4234e",
+  "name": "repos_github-api-test-org_github-api_issues_events",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/events",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_events-3.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"092fd69b20562cd35fb3c435ea1c0031\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D95C:194DAC:5D9FF80E",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=2>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\""
+    }
+  },
+  "uuid": "d6129252-9f48-4380-babb-cc06baa4234e",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10-83c7ab.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10-83c7ab.json
deleted file mode 100644
index ee21f4ce58..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10-83c7ab.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "83c7abdb-5f08-4826-9313-decbfa7b2531",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=8",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-83c7abdb-5f08-4826-9313-decbfa7b2531.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3099abaf575f78264f6a77ee055b40a6\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DA11:194E81:5D9FF813",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=7>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=9>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "83c7abdb-5f08-4826-9313-decbfa7b2531",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10.json
new file mode 100644
index 0000000000..1937957ef2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-10.json
@@ -0,0 +1,46 @@
+{
+  "id": "83c7abdb-5f08-4826-9313-decbfa7b2531",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=8",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-10.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3099abaf575f78264f6a77ee055b40a6\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DA11:194E81:5D9FF813",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=7>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=9>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "83c7abdb-5f08-4826-9313-decbfa7b2531",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11-6f0d69.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11-6f0d69.json
deleted file mode 100644
index 12c725c58b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11-6f0d69.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "6f0d6963-5006-4dba-b11b-a0408d0f798f",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=9",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-6f0d6963-5006-4dba-b11b-a0408d0f798f.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7479a98183ab9c40204e1adf35bcd59d\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DA33:194EA8:5D9FF813",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=8>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=10>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "6f0d6963-5006-4dba-b11b-a0408d0f798f",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11.json
new file mode 100644
index 0000000000..bd322a513a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-11.json
@@ -0,0 +1,46 @@
+{
+  "id": "6f0d6963-5006-4dba-b11b-a0408d0f798f",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=9",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-11.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7479a98183ab9c40204e1adf35bcd59d\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DA33:194EA8:5D9FF813",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=8>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=10>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "6f0d6963-5006-4dba-b11b-a0408d0f798f",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12-208a37.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12-208a37.json
deleted file mode 100644
index c1d2628ea8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12-208a37.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "208a37ec-cb3d-4d4e-b27f-f6df770111b3",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-208a37ec-cb3d-4d4e-b27f-f6df770111b3.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a4a6408a2ac034f1fbe3e3970977667e\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DA52:194ECF:5D9FF814",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=9>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=11>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "208a37ec-cb3d-4d4e-b27f-f6df770111b3",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12.json
new file mode 100644
index 0000000000..35f904f76a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-12.json
@@ -0,0 +1,46 @@
+{
+  "id": "208a37ec-cb3d-4d4e-b27f-f6df770111b3",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-12.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a4a6408a2ac034f1fbe3e3970977667e\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DA52:194ECF:5D9FF814",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=9>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=11>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "208a37ec-cb3d-4d4e-b27f-f6df770111b3",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13-94dd8e.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13-94dd8e.json
deleted file mode 100644
index 96498fc0c5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13-94dd8e.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "94dd8eff-b6f3-4003-89c9-c97721354a77",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=11",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-94dd8eff-b6f3-4003-89c9-c97721354a77.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"98a3f5cf7a07880aba4cf561323dccda\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DA74:194EF4:5D9FF814",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=10>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=12>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "94dd8eff-b6f3-4003-89c9-c97721354a77",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13.json
new file mode 100644
index 0000000000..7255181ed5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-13.json
@@ -0,0 +1,46 @@
+{
+  "id": "94dd8eff-b6f3-4003-89c9-c97721354a77",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=11",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-13.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"98a3f5cf7a07880aba4cf561323dccda\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DA74:194EF4:5D9FF814",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=10>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=12>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "94dd8eff-b6f3-4003-89c9-c97721354a77",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14-b1ad56.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14-b1ad56.json
deleted file mode 100644
index 4d0c03c85d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14-b1ad56.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=12",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4969",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"93f584f3cbca7b493137817b50efcb79\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DA8A:194F0D:5D9FF815",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=11>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=13>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14.json
new file mode 100644
index 0000000000..52e26ad332
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-14.json
@@ -0,0 +1,46 @@
+{
+  "id": "b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=12",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-14.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4969",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"93f584f3cbca7b493137817b50efcb79\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DA8A:194F0D:5D9FF815",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=11>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=13>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "b1ad56d6-c0c7-4679-a0dd-5a6c94eb84b1",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15-5f55d9.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15-5f55d9.json
deleted file mode 100644
index 0a10eda93e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15-5f55d9.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "5f55d936-4d74-4c99-bc0d-f3c3a90dd81a",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=13",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-5f55d936-4d74-4c99-bc0d-f3c3a90dd81a.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"631e803d6d5cd4accd96a32f4e8a8801\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DA9B:194F22:5D9FF816",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=12>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "5f55d936-4d74-4c99-bc0d-f3c3a90dd81a",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15.json
new file mode 100644
index 0000000000..6b9dd626d3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-15.json
@@ -0,0 +1,46 @@
+{
+  "id": "5f55d936-4d74-4c99-bc0d-f3c3a90dd81a",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=13",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-15.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"631e803d6d5cd4accd96a32f4e8a8801\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DA9B:194F22:5D9FF816",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=12>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "5f55d936-4d74-4c99-bc0d-f3c3a90dd81a",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16-491772.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16-491772.json
deleted file mode 100644
index 71e83f034f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16-491772.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "4917724b-b110-4549-81b5-c329a13c467a",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=14",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-4917724b-b110-4549-81b5-c329a13c467a.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"092e91a5d64a54cbf0a6c0a36e903875\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15DAB7:194F3C:5D9FF816",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=13>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "4917724b-b110-4549-81b5-c329a13c467a",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16.json
new file mode 100644
index 0000000000..c88dc37b92
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-16.json
@@ -0,0 +1,46 @@
+{
+  "id": "4917724b-b110-4549-81b5-c329a13c467a",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=14",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-16.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"092e91a5d64a54cbf0a6c0a36e903875\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15DAB7:194F3C:5D9FF816",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=13>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "4917724b-b110-4549-81b5-c329a13c467a",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4-2b6f60.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4-2b6f60.json
deleted file mode 100644
index 8d9b87a05f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4-2b6f60.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "2b6f606b-278c-47b2-99ff-9036f43b0f68",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-2b6f606b-278c-47b2-99ff-9036f43b0f68.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ffd8fe1745a4005b962c1a1286e56dc0\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D978:194DCB:5D9FF80F",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=3>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "2b6f606b-278c-47b2-99ff-9036f43b0f68",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4.json
new file mode 100644
index 0000000000..4e0404b105
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "2b6f606b-278c-47b2-99ff-9036f43b0f68",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-4.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ffd8fe1745a4005b962c1a1286e56dc0\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D978:194DCB:5D9FF80F",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=3>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "2b6f606b-278c-47b2-99ff-9036f43b0f68",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5-72a130.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5-72a130.json
deleted file mode 100644
index 2eeb683cf8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5-72a130.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "72a13002-acc3-4c49-a916-daaf249874b5",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-72a13002-acc3-4c49-a916-daaf249874b5.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2afc0b6e99395673ff63823bb29845e9\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D991:194DE8:5D9FF810",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=2>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=4>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "72a13002-acc3-4c49-a916-daaf249874b5",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5.json
new file mode 100644
index 0000000000..f332e3977b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-5.json
@@ -0,0 +1,46 @@
+{
+  "id": "72a13002-acc3-4c49-a916-daaf249874b5",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-5.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2afc0b6e99395673ff63823bb29845e9\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D991:194DE8:5D9FF810",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=2>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=4>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "72a13002-acc3-4c49-a916-daaf249874b5",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6-9c193f.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6-9c193f.json
deleted file mode 100644
index 5e3c84a909..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6-9c193f.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "9c193fd6-e6f6-4949-8414-cf031e70f82e",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-9c193fd6-e6f6-4949-8414-cf031e70f82e.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4977",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d332f6c50e3c94ecc91302b97d8ba899\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D9A7:194E04:5D9FF810",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=3>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=5>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "9c193fd6-e6f6-4949-8414-cf031e70f82e",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6.json
new file mode 100644
index 0000000000..e228146a81
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-6.json
@@ -0,0 +1,46 @@
+{
+  "id": "9c193fd6-e6f6-4949-8414-cf031e70f82e",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-6.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4977",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d332f6c50e3c94ecc91302b97d8ba899\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D9A7:194E04:5D9FF810",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=3>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=5>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "9c193fd6-e6f6-4949-8414-cf031e70f82e",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7-654e00.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7-654e00.json
deleted file mode 100644
index ca6df5641d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7-654e00.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "654e008f-d77e-4339-957e-f2bdfcab904b",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=5",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-654e008f-d77e-4339-957e-f2bdfcab904b.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"021b9686a4cb768611897c6a6ad6737f\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D9C1:194E22:5D9FF811",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=4>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=6>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "654e008f-d77e-4339-957e-f2bdfcab904b",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7.json
new file mode 100644
index 0000000000..a658176443
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-7.json
@@ -0,0 +1,46 @@
+{
+  "id": "654e008f-d77e-4339-957e-f2bdfcab904b",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=5",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-7.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4976",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"021b9686a4cb768611897c6a6ad6737f\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D9C1:194E22:5D9FF811",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=4>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=6>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "654e008f-d77e-4339-957e-f2bdfcab904b",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8-71d796.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8-71d796.json
deleted file mode 100644
index 5bf2b6369c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8-71d796.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "71d7968e-586e-4120-81db-eea6f1aca2f0",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=6",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-71d7968e-586e-4120-81db-eea6f1aca2f0.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8d9a4dccbaedb85de5d83b651c7025aa\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D9DA:194E3D:5D9FF811",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=5>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=7>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "71d7968e-586e-4120-81db-eea6f1aca2f0",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8.json
new file mode 100644
index 0000000000..4b95c1d242
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-8.json
@@ -0,0 +1,46 @@
+{
+  "id": "71d7968e-586e-4120-81db-eea6f1aca2f0",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=6",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-8.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8d9a4dccbaedb85de5d83b651c7025aa\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D9DA:194E3D:5D9FF811",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=5>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=7>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "71d7968e-586e-4120-81db-eea6f1aca2f0",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9-286927.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9-286927.json
deleted file mode 100644
index dba655ac07..0000000000
--- a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9-286927.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "28692783-a6a7-432a-bae1-15bcb4e48175",
-  "name": "repositories_206888201_issues_events",
-  "request": {
-    "url": "/repositories/206888201/issues/events?page=7",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_issues_events-28692783-a6a7-432a-bae1-15bcb4e48175.json",
-    "headers": {
-      "Date": "Fri, 11 Oct 2019 03:33:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1570768157",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d9a7cbd31107d98132b995ab96894661\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C422:6D1D:15D9F1:194E5C:5D9FF812",
-      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=6>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=8>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "28692783-a6a7-432a-bae1-15bcb4e48175",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9.json b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9.json
new file mode 100644
index 0000000000..560d445384
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHIssueEventTest/wiremock/testRepositoryEvents/mappings/repositories_206888201_issues_events-9.json
@@ -0,0 +1,46 @@
+{
+  "id": "28692783-a6a7-432a-bae1-15bcb4e48175",
+  "name": "repositories_206888201_issues_events",
+  "request": {
+    "url": "/repositories/206888201/issues/events?page=7",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_issues_events-9.json",
+    "headers": {
+      "Date": "Fri, 11 Oct 2019 03:33:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1570768157",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d9a7cbd31107d98132b995ab96894661\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C422:6D1D:15D9F1:194E5C:5D9FF812",
+      "Link": "<https://api.github.com/repositories/206888201/issues/events?page=6>; rel=\"prev\", <https://api.github.com/repositories/206888201/issues/events?page=8>; rel=\"next\", <https://api.github.com/repositories/206888201/issues/events?page=14>; rel=\"last\", <https://api.github.com/repositories/206888201/issues/events?page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "28692783-a6a7-432a-bae1-15bcb4e48175",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/licenses_mit-4cc836da-9288-41bd-886c-05c93470225d.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/licenses_mit-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/licenses_mit-4cc836da-9288-41bd-886c-05c93470225d.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/licenses_mit-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api-631120d1-4833-49ea-a8f7-55a6085625ef.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api-631120d1-4833-49ea-a8f7-55a6085625ef.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api_license-f6ba1895-6c06-4c51-9ad0-fcf322e87ee4.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api_license-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api_license-f6ba1895-6c06-4c51-9ad0-fcf322e87ee4.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/repos_github-api_github-api_license-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/user-eeb32135-bbb9-4c4c-8166-472f24fba13a.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/user-eeb32135-bbb9-4c4c-8166-472f24fba13a.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4-4cc836.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4-4cc836.json
deleted file mode 100644
index 569c283dfe..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4-4cc836.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "4cc836da-9288-41bd-886c-05c93470225d",
-  "name": "licenses_mit",
-  "request": {
-    "url": "/licenses/mit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "licenses_mit-4cc836da-9288-41bd-886c-05c93470225d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4583",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cdc71ea0b0e60f4cdbf00107bcf1035c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C161:67D5:1425BD1:18429E5:5D97817F"
-    }
-  },
-  "uuid": "4cc836da-9288-41bd-886c-05c93470225d",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4.json
new file mode 100644
index 0000000000..488d790ab7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/licenses_mit-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "4cc836da-9288-41bd-886c-05c93470225d",
+  "name": "licenses_mit",
+  "request": {
+    "url": "/licenses/mit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "licenses_mit-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4583",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cdc71ea0b0e60f4cdbf00107bcf1035c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C161:67D5:1425BD1:18429E5:5D97817F"
+    }
+  },
+  "uuid": "4cc836da-9288-41bd-886c-05c93470225d",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2-631120.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2-631120.json
deleted file mode 100644
index 4f8af42176..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2-631120.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "631120d1-4833-49ea-a8f7-55a6085625ef",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-631120d1-4833-49ea-a8f7-55a6085625ef.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4585",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"973d36671120e8acb6adb43ce42e6820\"",
-      "Last-Modified": "Fri, 04 Oct 2019 16:15:14 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C161:67D5:1425BB7:18429A6:5D97817E"
-    }
-  },
-  "uuid": "631120d1-4833-49ea-a8f7-55a6085625ef",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..3b1d99f80b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "631120d1-4833-49ea-a8f7-55a6085625ef",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4585",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"973d36671120e8acb6adb43ce42e6820\"",
+      "Last-Modified": "Fri, 04 Oct 2019 16:15:14 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C161:67D5:1425BB7:18429A6:5D97817E"
+    }
+  },
+  "uuid": "631120d1-4833-49ea-a8f7-55a6085625ef",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3-f6ba18.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3-f6ba18.json
deleted file mode 100644
index beba840651..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3-f6ba18.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f6ba1895-6c06-4c51-9ad0-fcf322e87ee4",
-  "name": "repos_github-api_github-api_license",
-  "request": {
-    "url": "/repos/github-api/github-api/license",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_license-f6ba1895-6c06-4c51-9ad0-fcf322e87ee4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4584",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22f018ca5a5e3c36ee8522bb91a5046a\"",
-      "Last-Modified": "Fri, 04 Oct 2019 16:15:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C161:67D5:1425BC5:18429D3:5D97817F"
-    }
-  },
-  "uuid": "f6ba1895-6c06-4c51-9ad0-fcf322e87ee4",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3.json
new file mode 100644
index 0000000000..1f559438b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/repos_github-api_github-api_license-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "f6ba1895-6c06-4c51-9ad0-fcf322e87ee4",
+  "name": "repos_github-api_github-api_license",
+  "request": {
+    "url": "/repos/github-api/github-api/license",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_license-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4584",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22f018ca5a5e3c36ee8522bb91a5046a\"",
+      "Last-Modified": "Fri, 04 Oct 2019 16:15:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C161:67D5:1425BC5:18429D3:5D97817F"
+    }
+  },
+  "uuid": "f6ba1895-6c06-4c51-9ad0-fcf322e87ee4",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1-eeb321.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1-eeb321.json
deleted file mode 100644
index 08f3f3a3b9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1-eeb321.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "eeb32135-bbb9-4c4c-8166-472f24fba13a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-eeb32135-bbb9-4c4c-8166-472f24fba13a.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4587",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C161:67D5:1425B9D:1842999:5D97817E"
-    }
-  },
-  "uuid": "eeb32135-bbb9-4c4c-8166-472f24fba13a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1.json
new file mode 100644
index 0000000000..1f15db0dc5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryFullLicense/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "eeb32135-bbb9-4c4c-8166-472f24fba13a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4587",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C161:67D5:1425B9D:1842999:5D97817E"
+    }
+  },
+  "uuid": "eeb32135-bbb9-4c4c-8166-472f24fba13a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api-1f9552cb-0b47-47ca-bb9b-f685d1dbbf05.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api-1f9552cb-0b47-47ca-bb9b-f685d1dbbf05.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api_license-b99917fd-7863-4815-8e2e-cd3261475e98.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api_license-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api_license-b99917fd-7863-4815-8e2e-cd3261475e98.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/repos_github-api_github-api_license-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/user-659cc231-9415-4c8e-8f9f-153362753343.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/user-659cc231-9415-4c8e-8f9f-153362753343.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2-1f9552.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2-1f9552.json
deleted file mode 100644
index cbf022137b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2-1f9552.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1f9552cb-0b47-47ca-bb9b-f685d1dbbf05",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-1f9552cb-0b47-47ca-bb9b-f685d1dbbf05.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4589",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"973d36671120e8acb6adb43ce42e6820\"",
-      "Last-Modified": "Fri, 04 Oct 2019 16:15:14 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C15D:9576:93A269:B07BAE:5D97817C"
-    }
-  },
-  "uuid": "1f9552cb-0b47-47ca-bb9b-f685d1dbbf05",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..755f75acfe
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "1f9552cb-0b47-47ca-bb9b-f685d1dbbf05",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4589",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"973d36671120e8acb6adb43ce42e6820\"",
+      "Last-Modified": "Fri, 04 Oct 2019 16:15:14 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C15D:9576:93A269:B07BAE:5D97817C"
+    }
+  },
+  "uuid": "1f9552cb-0b47-47ca-bb9b-f685d1dbbf05",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3-b99917.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3-b99917.json
deleted file mode 100644
index 919437ad95..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3-b99917.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b99917fd-7863-4815-8e2e-cd3261475e98",
-  "name": "repos_github-api_github-api_license",
-  "request": {
-    "url": "/repos/github-api/github-api/license",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_license-b99917fd-7863-4815-8e2e-cd3261475e98.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4588",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22f018ca5a5e3c36ee8522bb91a5046a\"",
-      "Last-Modified": "Fri, 04 Oct 2019 16:15:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C15D:9576:93A277:B07BCE:5D97817D"
-    }
-  },
-  "uuid": "b99917fd-7863-4815-8e2e-cd3261475e98",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3.json
new file mode 100644
index 0000000000..773df3fc29
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/repos_github-api_github-api_license-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "b99917fd-7863-4815-8e2e-cd3261475e98",
+  "name": "repos_github-api_github-api_license",
+  "request": {
+    "url": "/repos/github-api/github-api/license",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_license-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4588",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22f018ca5a5e3c36ee8522bb91a5046a\"",
+      "Last-Modified": "Fri, 04 Oct 2019 16:15:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C15D:9576:93A277:B07BCE:5D97817D"
+    }
+  },
+  "uuid": "b99917fd-7863-4815-8e2e-cd3261475e98",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1-659cc2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1-659cc2.json
deleted file mode 100644
index 7471aa0cd6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1-659cc2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "659cc231-9415-4c8e-8f9f-153362753343",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-659cc231-9415-4c8e-8f9f-153362753343.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4591",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C15D:9576:93A250:B07BA4:5D97817C"
-    }
-  },
-  "uuid": "659cc231-9415-4c8e-8f9f-153362753343",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1.json
new file mode 100644
index 0000000000..192e11ad65
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicense/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "659cc231-9415-4c8e-8f9f-153362753343",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4591",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C15D:9576:93A250:B07BA4:5D97817C"
+    }
+  },
+  "uuid": "659cc231-9415-4c8e-8f9f-153362753343",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom-bd1153cf-7be6-4147-9e7e-e12a0d7789f2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom-bd1153cf-7be6-4147-9e7e-e12a0d7789f2.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom_license-a0fac733-4d83-4d68-be23-c1c57574ea10.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom_license-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom_license-a0fac733-4d83-4d68-be23-c1c57574ea10.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/repos_atom_atom_license-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/user-30af4231-bcac-4e52-8dfe-da122934c709.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/user-30af4231-bcac-4e52-8dfe-da122934c709.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2-bd1153.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2-bd1153.json
deleted file mode 100644
index 098748787a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2-bd1153.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bd1153cf-7be6-4147-9e7e-e12a0d7789f2",
-  "name": "repos_atom_atom",
-  "request": {
-    "url": "/repos/atom/atom",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_atom_atom-bd1153cf-7be6-4147-9e7e-e12a0d7789f2.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4572",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a63d0def5b3c51b1300382b5fe799e08\"",
-      "Last-Modified": "Fri, 04 Oct 2019 16:36:19 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C16B:6B2D:155EEB9:198D221:5D978181"
-    }
-  },
-  "uuid": "bd1153cf-7be6-4147-9e7e-e12a0d7789f2",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2.json
new file mode 100644
index 0000000000..508f3351c9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "bd1153cf-7be6-4147-9e7e-e12a0d7789f2",
+  "name": "repos_atom_atom",
+  "request": {
+    "url": "/repos/atom/atom",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_atom_atom-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4572",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a63d0def5b3c51b1300382b5fe799e08\"",
+      "Last-Modified": "Fri, 04 Oct 2019 16:36:19 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C16B:6B2D:155EEB9:198D221:5D978181"
+    }
+  },
+  "uuid": "bd1153cf-7be6-4147-9e7e-e12a0d7789f2",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3-a0fac7.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3-a0fac7.json
deleted file mode 100644
index 79dbe2291f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3-a0fac7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a0fac733-4d83-4d68-be23-c1c57574ea10",
-  "name": "repos_atom_atom_license",
-  "request": {
-    "url": "/repos/atom/atom/license",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_atom_atom_license-a0fac733-4d83-4d68-be23-c1c57574ea10.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4571",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3644815f2f59c056ae2d1b03bf4b63e0\"",
-      "Last-Modified": "Tue, 24 Sep 2019 20:19:48 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C16B:6B2D:155EECD:198D249:5D978181"
-    }
-  },
-  "uuid": "a0fac733-4d83-4d68-be23-c1c57574ea10",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3.json
new file mode 100644
index 0000000000..0a0c284998
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/repos_atom_atom_license-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "a0fac733-4d83-4d68-be23-c1c57574ea10",
+  "name": "repos_atom_atom_license",
+  "request": {
+    "url": "/repos/atom/atom/license",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_atom_atom_license-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4571",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3644815f2f59c056ae2d1b03bf4b63e0\"",
+      "Last-Modified": "Tue, 24 Sep 2019 20:19:48 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C16B:6B2D:155EECD:198D249:5D978181"
+    }
+  },
+  "uuid": "a0fac733-4d83-4d68-be23-c1c57574ea10",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1-30af42.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1-30af42.json
deleted file mode 100644
index 746f6729a2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1-30af42.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "30af4231-bcac-4e52-8dfe-da122934c709",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-30af4231-bcac-4e52-8dfe-da122934c709.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4574",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C16B:6B2D:155EEA1:198D211:5D978181"
-    }
-  },
-  "uuid": "30af4231-bcac-4e52-8dfe-da122934c709",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1.json
new file mode 100644
index 0000000000..7e8566e654
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseAtom/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "30af4231-bcac-4e52-8dfe-da122934c709",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4574",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C16B:6B2D:155EEA1:198D211:5D978181"
+    }
+  },
+  "uuid": "30af4231-bcac-4e52-8dfe-da122934c709",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes-7c3e7b36-6930-4804-8d6e-83075abfcde8.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes-7c3e7b36-6930-4804-8d6e-83075abfcde8.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes_license-c59d46f6-2c50-4afd-80b6-40dbfa4dd754.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes_license-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes_license-c59d46f6-2c50-4afd-80b6-40dbfa4dd754.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/repos_pomes_pomes_license-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/user-767d6575-bd87-4641-a940-a567ff936667.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/user-767d6575-bd87-4641-a940-a567ff936667.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2-7c3e7b.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2-7c3e7b.json
deleted file mode 100644
index 3ab02aabb7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2-7c3e7b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7c3e7b36-6930-4804-8d6e-83075abfcde8",
-  "name": "repos_pomes_pomes",
-  "request": {
-    "url": "/repos/pomes/pomes",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_pomes_pomes-7c3e7b36-6930-4804-8d6e-83075abfcde8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4576",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"66e425cde189cc71851c3869a89f8541\"",
-      "Last-Modified": "Sun, 26 Jun 2016 05:41:12 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C167:78ED:1CE7E5A:2277637:5D978180"
-    }
-  },
-  "uuid": "7c3e7b36-6930-4804-8d6e-83075abfcde8",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2.json
new file mode 100644
index 0000000000..1341b4bd50
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7c3e7b36-6930-4804-8d6e-83075abfcde8",
+  "name": "repos_pomes_pomes",
+  "request": {
+    "url": "/repos/pomes/pomes",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_pomes_pomes-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4576",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"66e425cde189cc71851c3869a89f8541\"",
+      "Last-Modified": "Sun, 26 Jun 2016 05:41:12 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C167:78ED:1CE7E5A:2277637:5D978180"
+    }
+  },
+  "uuid": "7c3e7b36-6930-4804-8d6e-83075abfcde8",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3-c59d46.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3-c59d46.json
deleted file mode 100644
index b4335b177a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3-c59d46.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c59d46f6-2c50-4afd-80b6-40dbfa4dd754",
-  "name": "repos_pomes_pomes_license",
-  "request": {
-    "url": "/repos/pomes/pomes/license",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_pomes_pomes_license-c59d46f6-2c50-4afd-80b6-40dbfa4dd754.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4575",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9c9e74dccdac3dc6904a9b3926a63906\"",
-      "Last-Modified": "Sun, 14 Aug 2016 23:16:59 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C167:78ED:1CE7E70:2277667:5D978180"
-    }
-  },
-  "uuid": "c59d46f6-2c50-4afd-80b6-40dbfa4dd754",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3.json
new file mode 100644
index 0000000000..4bcfe7b7d4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/repos_pomes_pomes_license-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "c59d46f6-2c50-4afd-80b6-40dbfa4dd754",
+  "name": "repos_pomes_pomes_license",
+  "request": {
+    "url": "/repos/pomes/pomes/license",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_pomes_pomes_license-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4575",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9c9e74dccdac3dc6904a9b3926a63906\"",
+      "Last-Modified": "Sun, 14 Aug 2016 23:16:59 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C167:78ED:1CE7E70:2277667:5D978180"
+    }
+  },
+  "uuid": "c59d46f6-2c50-4afd-80b6-40dbfa4dd754",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1-767d65.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1-767d65.json
deleted file mode 100644
index a80ff874ca..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1-767d65.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "767d6575-bd87-4641-a940-a567ff936667",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-767d6575-bd87-4641-a940-a567ff936667.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4578",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C167:78ED:1CE7E34:2277624:5D978180"
-    }
-  },
-  "uuid": "767d6575-bd87-4641-a940-a567ff936667",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1.json
new file mode 100644
index 0000000000..71cc8e1c06
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "767d6575-bd87-4641-a940-a567ff936667",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4578",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C167:78ED:1CE7E34:2277624:5D978180"
+    }
+  },
+  "uuid": "767d6575-bd87-4641-a940-a567ff936667",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/__files/pomes_pomes_master_license-050b93b9-0d3b-4dd2-bde1-a220548659e4.txt b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/__files/pomes_pomes_master_license-1.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/__files/pomes_pomes_master_license-050b93b9-0d3b-4dd2-bde1-a220548659e4.txt
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/__files/pomes_pomes_master_license-1.txt
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1-050b93.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1-050b93.json
deleted file mode 100644
index 70c6eb1dd9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1-050b93.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "050b93b9-0d3b-4dd2-bde1-a220548659e4",
-  "name": "pomes_pomes_master_license",
-  "request": {
-    "url": "/pomes/pomes/master/LICENSE",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "pomes_pomes_master_license-050b93b9-0d3b-4dd2-bde1-a220548659e4.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"8371492840f9485d7baf719dc2ae3e4cb9e8c03b\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "D052:95E9:35B030:3EB19C:5D97BE56",
-      "Accept-Ranges": "bytes",
-      "Date": "Fri, 04 Oct 2019 21:51:06 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1029-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570225867.643479,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "ed4498a6662707a954a7a5c0303bd74ec724215a",
-      "Expires": "Fri, 04 Oct 2019 21:56:06 GMT",
-      "Source-Age": "116"
-    }
-  },
-  "uuid": "050b93b9-0d3b-4dd2-bde1-a220548659e4",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1.json
new file mode 100644
index 0000000000..979ae599a6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicenseContent_raw/mappings/pomes_pomes_master_license-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "050b93b9-0d3b-4dd2-bde1-a220548659e4",
+  "name": "pomes_pomes_master_license",
+  "request": {
+    "url": "/pomes/pomes/master/LICENSE",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "pomes_pomes_master_license-1.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"8371492840f9485d7baf719dc2ae3e4cb9e8c03b\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "D052:95E9:35B030:3EB19C:5D97BE56",
+      "Accept-Ranges": "bytes",
+      "Date": "Fri, 04 Oct 2019 21:51:06 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1029-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570225867.643479,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "ed4498a6662707a954a7a5c0303bd74ec724215a",
+      "Expires": "Fri, 04 Oct 2019 21:56:06 GMT",
+      "Source-Age": "116"
+    }
+  },
+  "uuid": "050b93b9-0d3b-4dd2-bde1-a220548659e4",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes-c9deed07-bd75-4016-bc8e-ee09b582b604.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes-c9deed07-bd75-4016-bc8e-ee09b582b604.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes_license-47a3f209-8281-4238-b926-f199992b4cdf.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes_license-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes_license-47a3f209-8281-4238-b926-f199992b4cdf.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/repos_pomes_pomes_license-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/user-f33aa0eb-ef47-4106-b877-b8938a450623.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/user-f33aa0eb-ef47-4106-b877-b8938a450623.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2-c9deed.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2-c9deed.json
deleted file mode 100644
index d4ad90544c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2-c9deed.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c9deed07-bd75-4016-bc8e-ee09b582b604",
-  "name": "repos_pomes_pomes",
-  "request": {
-    "url": "/repos/pomes/pomes",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_pomes_pomes-c9deed07-bd75-4016-bc8e-ee09b582b604.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4562",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"66e425cde189cc71851c3869a89f8541\"",
-      "Last-Modified": "Sun, 26 Jun 2016 05:41:12 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C174:361C:AC6AF8:CD8FD1:5D978182"
-    }
-  },
-  "uuid": "c9deed07-bd75-4016-bc8e-ee09b582b604",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2.json
new file mode 100644
index 0000000000..52b819a5af
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "c9deed07-bd75-4016-bc8e-ee09b582b604",
+  "name": "repos_pomes_pomes",
+  "request": {
+    "url": "/repos/pomes/pomes",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_pomes_pomes-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4562",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"66e425cde189cc71851c3869a89f8541\"",
+      "Last-Modified": "Sun, 26 Jun 2016 05:41:12 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C174:361C:AC6AF8:CD8FD1:5D978182"
+    }
+  },
+  "uuid": "c9deed07-bd75-4016-bc8e-ee09b582b604",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3-47a3f2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3-47a3f2.json
deleted file mode 100644
index 0114266d26..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3-47a3f2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "47a3f209-8281-4238-b926-f199992b4cdf",
-  "name": "repos_pomes_pomes_license",
-  "request": {
-    "url": "/repos/pomes/pomes/license",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_pomes_pomes_license-47a3f209-8281-4238-b926-f199992b4cdf.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4561",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9c9e74dccdac3dc6904a9b3926a63906\"",
-      "Last-Modified": "Sun, 14 Aug 2016 23:16:59 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C174:361C:AC6B02:CD900F:5D978183"
-    }
-  },
-  "uuid": "47a3f209-8281-4238-b926-f199992b4cdf",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3.json
new file mode 100644
index 0000000000..7676d94a57
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/repos_pomes_pomes_license-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "47a3f209-8281-4238-b926-f199992b4cdf",
+  "name": "repos_pomes_pomes_license",
+  "request": {
+    "url": "/repos/pomes/pomes/license",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_pomes_pomes_license-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4561",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9c9e74dccdac3dc6904a9b3926a63906\"",
+      "Last-Modified": "Sun, 14 Aug 2016 23:16:59 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C174:361C:AC6B02:CD900F:5D978183"
+    }
+  },
+  "uuid": "47a3f209-8281-4238-b926-f199992b4cdf",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1-f33aa0.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1-f33aa0.json
deleted file mode 100644
index e23c6f8778..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1-f33aa0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f33aa0eb-ef47-4106-b877-b8938a450623",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f33aa0eb-ef47-4106-b877-b8938a450623.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4564",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C174:361C:AC6ACA:CD8FC8:5D978182"
-    }
-  },
-  "uuid": "f33aa0eb-ef47-4106-b877-b8938a450623",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1.json
new file mode 100644
index 0000000000..157630bc83
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryLicensePomes/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f33aa0eb-ef47-4106-b877-b8938a450623",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4564",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C174:361C:AC6ACA:CD8FC8:5D978182"
+    }
+  },
+  "uuid": "f33aa0eb-ef47-4106-b877-b8938a450623",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/repos_github-api-test-org_empty-ed789279-0e18-43b9-8ee5-4a9a40160834.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/repos_github-api-test-org_empty-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/repos_github-api-test-org_empty-ed789279-0e18-43b9-8ee5-4a9a40160834.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/repos_github-api-test-org_empty-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/user-3003d0dd-7267-40ad-a499-e3fb8ce52a3f.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/user-3003d0dd-7267-40ad-a499-e3fb8ce52a3f.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2-ed7892.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2-ed7892.json
deleted file mode 100644
index fd78fe58b6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2-ed7892.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ed789279-0e18-43b9-8ee5-4a9a40160834",
-  "name": "repos_github-api-test-org_empty",
-  "request": {
-    "url": "/repos/github-api-test-org/empty",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_empty-ed789279-0e18-43b9-8ee5-4a9a40160834.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4580",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"71a57ee919c57e5e9eb076f615232a66\"",
-      "Last-Modified": "Sat, 04 Jun 2016 03:22:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C164:78ED:1CE7E15:22775EE:5D97817F"
-    }
-  },
-  "uuid": "ed789279-0e18-43b9-8ee5-4a9a40160834",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2.json
new file mode 100644
index 0000000000..39cc0a226a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "ed789279-0e18-43b9-8ee5-4a9a40160834",
+  "name": "repos_github-api-test-org_empty",
+  "request": {
+    "url": "/repos/github-api-test-org/empty",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_empty-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4580",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"71a57ee919c57e5e9eb076f615232a66\"",
+      "Last-Modified": "Sat, 04 Jun 2016 03:22:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C164:78ED:1CE7E15:22775EE:5D97817F"
+    }
+  },
+  "uuid": "ed789279-0e18-43b9-8ee5-4a9a40160834",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty_license-3-fb7ab8.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty_license-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty_license-3-fb7ab8.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/repos_github-api-test-org_empty_license-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1-3003d0.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1-3003d0.json
deleted file mode 100644
index e8333a6af7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1-3003d0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3003d0dd-7267-40ad-a499-e3fb8ce52a3f",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3003d0dd-7267-40ad-a499-e3fb8ce52a3f.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4582",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C164:78ED:1CE7DF6:22775DB:5D97817F"
-    }
-  },
-  "uuid": "3003d0dd-7267-40ad-a499-e3fb8ce52a3f",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1.json
new file mode 100644
index 0000000000..563fbbc930
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/checkRepositoryWithoutLicense/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "3003d0dd-7267-40ad-a499-e3fb8ce52a3f",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4582",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C164:78ED:1CE7DF6:22775DB:5D97817F"
+    }
+  },
+  "uuid": "3003d0dd-7267-40ad-a499-e3fb8ce52a3f",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/licenses_mit-2182eadf-58a8-487f-89af-e6f6e8c527fe.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/licenses_mit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/licenses_mit-2182eadf-58a8-487f-89af-e6f6e8c527fe.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/licenses_mit-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/user-38876ae8-0962-4f1b-97cf-78ca1fb1fcb9.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/user-38876ae8-0962-4f1b-97cf-78ca1fb1fcb9.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2-2182ea.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2-2182ea.json
deleted file mode 100644
index 5c9ffb338d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2-2182ea.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "2182eadf-58a8-487f-89af-e6f6e8c527fe",
-  "name": "licenses_mit",
-  "request": {
-    "url": "/licenses/mit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "licenses_mit-2182eadf-58a8-487f-89af-e6f6e8c527fe.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4565",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cdc71ea0b0e60f4cdbf00107bcf1035c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C171:9576:93A2DE:B07C4A:5D978182"
-    }
-  },
-  "uuid": "2182eadf-58a8-487f-89af-e6f6e8c527fe",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2.json
new file mode 100644
index 0000000000..a3873cdee7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/licenses_mit-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "2182eadf-58a8-487f-89af-e6f6e8c527fe",
+  "name": "licenses_mit",
+  "request": {
+    "url": "/licenses/mit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "licenses_mit-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4565",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cdc71ea0b0e60f4cdbf00107bcf1035c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C171:9576:93A2DE:B07C4A:5D978182"
+    }
+  },
+  "uuid": "2182eadf-58a8-487f-89af-e6f6e8c527fe",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1-38876a.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1-38876a.json
deleted file mode 100644
index ebf17565ff..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1-38876a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "38876ae8-0962-4f1b-97cf-78ca1fb1fcb9",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-38876ae8-0962-4f1b-97cf-78ca1fb1fcb9.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4567",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C171:9576:93A2D3:B07C45:5D978182"
-    }
-  },
-  "uuid": "38876ae8-0962-4f1b-97cf-78ca1fb1fcb9",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1.json
new file mode 100644
index 0000000000..5949335ac4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/getLicense/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "38876ae8-0962-4f1b-97cf-78ca1fb1fcb9",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4567",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C171:9576:93A2D3:B07C45:5D978182"
+    }
+  },
+  "uuid": "38876ae8-0962-4f1b-97cf-78ca1fb1fcb9",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/licenses-b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/licenses-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/licenses-b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/licenses-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/user-dfe7f772-b859-48ce-919e-54ccde4cdd28.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/user-dfe7f772-b859-48ce-919e-54ccde4cdd28.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2-b3d307.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2-b3d307.json
deleted file mode 100644
index f9546803a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2-b3d307.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8",
-  "name": "licenses",
-  "request": {
-    "url": "/licenses",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "licenses-b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4558",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"817ce11d2bcbc6e73bfd956126377438\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C177:67D6:1D2C942:22B621B:5D978183"
-    }
-  },
-  "uuid": "b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2.json
new file mode 100644
index 0000000000..674cd18553
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/licenses-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8",
+  "name": "licenses",
+  "request": {
+    "url": "/licenses",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "licenses-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4558",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"817ce11d2bcbc6e73bfd956126377438\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C177:67D6:1D2C942:22B621B:5D978183"
+    }
+  },
+  "uuid": "b3d307b7-ab1a-4a9e-9b89-d0a7e8fcd2e8",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1-dfe7f7.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1-dfe7f7.json
deleted file mode 100644
index c23b5a850d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1-dfe7f7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "dfe7f772-b859-48ce-919e-54ccde4cdd28",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-dfe7f772-b859-48ce-919e-54ccde4cdd28.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4560",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C177:67D6:1D2C91A:22B6203:5D978183"
-    }
-  },
-  "uuid": "dfe7f772-b859-48ce-919e-54ccde4cdd28",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1.json
new file mode 100644
index 0000000000..54468f727b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicenses/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "dfe7f772-b859-48ce-919e-54ccde4cdd28",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4560",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C177:67D6:1D2C91A:22B6203:5D978183"
+    }
+  },
+  "uuid": "dfe7f772-b859-48ce-919e-54ccde4cdd28",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/licenses-f00fa680-0dd6-401b-a35f-1ed72d7587a7.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/licenses-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/licenses-f00fa680-0dd6-401b-a35f-1ed72d7587a7.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/licenses-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/user-b8102c16-0e43-4f4d-96c1-7d6cfb5981c2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/user-b8102c16-0e43-4f4d-96c1-7d6cfb5981c2.json
rename to src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2-f00fa6.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2-f00fa6.json
deleted file mode 100644
index b22fa1be00..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2-f00fa6.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "f00fa680-0dd6-401b-a35f-1ed72d7587a7",
-  "name": "licenses",
-  "request": {
-    "url": "/licenses",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "licenses-f00fa680-0dd6-401b-a35f-1ed72d7587a7.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4568",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"817ce11d2bcbc6e73bfd956126377438\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C16E:78E9:15A3A1A:19D2447:5D978181"
-    }
-  },
-  "uuid": "f00fa680-0dd6-401b-a35f-1ed72d7587a7",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2.json
new file mode 100644
index 0000000000..48b31e3895
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/licenses-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "f00fa680-0dd6-401b-a35f-1ed72d7587a7",
+  "name": "licenses",
+  "request": {
+    "url": "/licenses",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "licenses-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4568",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"817ce11d2bcbc6e73bfd956126377438\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C16E:78E9:15A3A1A:19D2447:5D978181"
+    }
+  },
+  "uuid": "f00fa680-0dd6-401b-a35f-1ed72d7587a7",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1-b8102c.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1-b8102c.json
deleted file mode 100644
index 3b7c880bb4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1-b8102c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b8102c16-0e43-4f4d-96c1-7d6cfb5981c2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b8102c16-0e43-4f4d-96c1-7d6cfb5981c2.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4570",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C16E:78E9:15A39FF:19D2438:5D978181"
-    }
-  },
-  "uuid": "b8102c16-0e43-4f4d-96c1-7d6cfb5981c2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1.json
new file mode 100644
index 0000000000..dfc08da993
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHLicenseTest/wiremock/listLicensesCheckIndividualLicense/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b8102c16-0e43-4f4d-96c1-7d6cfb5981c2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:29:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4570",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C16E:78E9:15A39FF:19D2438:5D978181"
+    }
+  },
+  "uuid": "b8102c16-0e43-4f4d-96c1-7d6cfb5981c2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
index a2410595bd..2c53a60ba5 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json
@@ -1,40 +1,43 @@
 {
-  "id" : "2998ad4b-3dbd-374e-a591-d85214efc96b",
-  "request" : {
-    "url" : "/marketplace_listing/plans/7/accounts",
-    "method" : "GET",
+  "id": "2998ad4b-3dbd-374e-a591-d85214efc96b",
+  "request": {
+    "url": "/marketplace_listing/plans/7/accounts",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json",
-    "headers" : {
-      "Date" : "Sun, 08 Dec 2019 22:26:01 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4988",
-      "X-RateLimit-Reset" : "1575844220",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"4bc63e063e145dc1d50cf0144b082493\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "E7A0:3ED0:1B5FEA5:1EFC68E:5DED7878"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-7-accounts-QgHUA.json",
+    "headers": {
+      "Date": "Sun, 08 Dec 2019 22:26:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1575844220",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4bc63e063e145dc1d50cf0144b082493\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E7A0:3ED0:1B5FEA5:1EFC68E:5DED7878"
     }
   },
-  "uuid" : "2998ad4b-3dbd-374e-a591-d85214efc96b"
+  "uuid": "2998ad4b-3dbd-374e-a591-d85214efc96b"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-C43G2.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-C43G2.json
index c3b5abf9a1..4b04af5a34 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-C43G2.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccounts/mappings/mapping-marketplace_listing-stubbed-plans-C43G2.json
@@ -1,40 +1,43 @@
 {
-  "id" : "c35c1485-2184-3f61-b731-17aa79f4e05a",
-  "request" : {
-    "url" : "/marketplace_listing/plans",
-    "method" : "GET",
+  "id": "c35c1485-2184-3f61-b731-17aa79f4e05a",
+  "request": {
+    "url": "/marketplace_listing/plans",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-C43G2.json",
-    "headers" : {
-      "Date" : "Sun, 08 Dec 2019 22:26:00 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4989",
-      "X-RateLimit-Reset" : "1575844220",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "E7A0:3ED0:1B5FE9B:1EFC686:5DED7878"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-C43G2.json",
+    "headers": {
+      "Date": "Sun, 08 Dec 2019 22:26:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4989",
+      "X-RateLimit-Reset": "1575844220",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E7A0:3ED0:1B5FE9B:1EFC686:5DED7878"
     }
   },
-  "uuid" : "c35c1485-2184-3f61-b731-17aa79f4e05a"
+  "uuid": "c35c1485-2184-3f61-b731-17aa79f4e05a"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
index 15b4eeabba..31d166f883 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json
@@ -1,40 +1,43 @@
 {
-  "id" : "abb1bc8c-991c-3321-b1a3-fd32518d7622",
-  "request" : {
-    "url" : "/marketplace_listing/plans/7/accounts?direction=desc",
-    "method" : "GET",
+  "id": "abb1bc8c-991c-3321-b1a3-fd32518d7622",
+  "request": {
+    "url": "/marketplace_listing/plans/7/accounts?direction=desc",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:49:55 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4995",
-      "X-RateLimit-Reset" : "1575877794",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"c380429122e5063651ab282a7daf8e8a\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDB6:515A:2215EBF:26BECC4:5DEDEE92"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-7-accounts-aoRnP.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:49:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4995",
+      "X-RateLimit-Reset": "1575877794",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c380429122e5063651ab282a7daf8e8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDB6:515A:2215EBF:26BECC4:5DEDEE92"
     }
   },
-  "uuid" : "abb1bc8c-991c-3321-b1a3-fd32518d7622"
+  "uuid": "abb1bc8c-991c-3321-b1a3-fd32518d7622"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
index bb91a51864..79b6e0fb80 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json
@@ -1,40 +1,43 @@
 {
-  "id" : "2269b7d0-4779-3470-ae98-88ff76196b4c",
-  "request" : {
-    "url" : "/marketplace_listing/plans/8/accounts?direction=desc",
-    "method" : "GET",
+  "id": "2269b7d0-4779-3470-ae98-88ff76196b4c",
+  "request": {
+    "url": "/marketplace_listing/plans/8/accounts?direction=desc",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:49:55 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4994",
-      "X-RateLimit-Reset" : "1575877794",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"c380429122e5063651ab282a7daf8e8a\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDB6:515A:2215ECD:26BECE1:5DEDEE93"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-8-accounts-NZw9v.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:49:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1575877794",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c380429122e5063651ab282a7daf8e8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDB6:515A:2215ECD:26BECE1:5DEDEE93"
     }
   },
-  "uuid" : "2269b7d0-4779-3470-ae98-88ff76196b4c"
+  "uuid": "2269b7d0-4779-3470-ae98-88ff76196b4c"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
index 64b18890c6..85fa529ba1 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json
@@ -1,40 +1,43 @@
 {
-  "id" : "d88c8d05-98c9-37fd-8006-16662b366657",
-  "request" : {
-    "url" : "/marketplace_listing/plans/9/accounts?direction=desc",
-    "method" : "GET",
+  "id": "d88c8d05-98c9-37fd-8006-16662b366657",
+  "request": {
+    "url": "/marketplace_listing/plans/9/accounts?direction=desc",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:49:55 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4993",
-      "X-RateLimit-Reset" : "1575877794",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"c380429122e5063651ab282a7daf8e8a\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDB6:515A:2215EDB:26BECF2:5DEDEE93"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-9-accounts-b1MbT.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:49:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4993",
+      "X-RateLimit-Reset": "1575877794",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c380429122e5063651ab282a7daf8e8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDB6:515A:2215EDB:26BECF2:5DEDEE93"
     }
   },
-  "uuid" : "d88c8d05-98c9-37fd-8006-16662b366657"
+  "uuid": "d88c8d05-98c9-37fd-8006-16662b366657"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-uewkE.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-uewkE.json
index 2c85d6194c..eed3cb8745 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-uewkE.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithDirection/mappings/mapping-marketplace_listing-stubbed-plans-uewkE.json
@@ -1,40 +1,43 @@
 {
-  "id" : "0a169daf-976c-397b-b781-a6fe3a15c139",
-  "request" : {
-    "url" : "/marketplace_listing/plans",
-    "method" : "GET",
+  "id": "0a169daf-976c-397b-b781-a6fe3a15c139",
+  "request": {
+    "url": "/marketplace_listing/plans",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-uewkE.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:49:54 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4996",
-      "X-RateLimit-Reset" : "1575877794",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDB6:515A:2215EA2:26BECB6:5DEDEE92"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-uewkE.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:49:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4996",
+      "X-RateLimit-Reset": "1575877794",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDB6:515A:2215EA2:26BECB6:5DEDEE92"
     }
   },
-  "uuid" : "0a169daf-976c-397b-b781-a6fe3a15c139"
+  "uuid": "0a169daf-976c-397b-b781-a6fe3a15c139"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-cz27N.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
index 9243c27e16..10928ad32c 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-7-accounts-cz27N.json
@@ -1,40 +1,43 @@
 {
-  "id" : "4bad09bb-8960-3af5-856d-95d0e889bdbc",
-  "request" : {
-    "url" : "/marketplace_listing/plans/7/accounts?sort=updated&direction=desc",
-    "method" : "GET",
+  "id": "4bad09bb-8960-3af5-856d-95d0e889bdbc",
+  "request": {
+    "url": "/marketplace_listing/plans/7/accounts?sort=updated&direction=desc",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:58:10 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4987",
-      "X-RateLimit-Reset" : "1575878183",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"c380429122e5063651ab282a7daf8e8a\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDE1:0E13:211104D:25A0DCF:5DEDF081"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-7-accounts-cz27N.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:58:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1575878183",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c380429122e5063651ab282a7daf8e8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDE1:0E13:211104D:25A0DCF:5DEDF081"
     }
   },
-  "uuid" : "4bad09bb-8960-3af5-856d-95d0e889bdbc"
+  "uuid": "4bad09bb-8960-3af5-856d-95d0e889bdbc"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
index 435301795a..707ccf7529 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json
@@ -1,40 +1,43 @@
 {
-  "id" : "531bdda5-c4e2-3c1b-b816-9ae8b9867bc3",
-  "request" : {
-    "url" : "/marketplace_listing/plans/8/accounts?sort=updated&direction=desc",
-    "method" : "GET",
+  "id": "531bdda5-c4e2-3c1b-b816-9ae8b9867bc3",
+  "request": {
+    "url": "/marketplace_listing/plans/8/accounts?sort=updated&direction=desc",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:58:10 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4986",
-      "X-RateLimit-Reset" : "1575878183",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"c380429122e5063651ab282a7daf8e8a\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDE1:0E13:2111059:25A0DE5:5DEDF082"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-8-accounts-8T1Pb.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:58:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1575878183",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c380429122e5063651ab282a7daf8e8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDE1:0E13:2111059:25A0DE5:5DEDF082"
     }
   },
-  "uuid" : "531bdda5-c4e2-3c1b-b816-9ae8b9867bc3"
+  "uuid": "531bdda5-c4e2-3c1b-b816-9ae8b9867bc3"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-VT77w.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
index fca2296d4f..49b41070da 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-9-accounts-VT77w.json
@@ -1,40 +1,43 @@
 {
-  "id" : "96ec4464-54e7-3b63-a0e3-810016c2a615",
-  "request" : {
-    "url" : "/marketplace_listing/plans/9/accounts?sort=updated&direction=desc",
-    "method" : "GET",
+  "id": "96ec4464-54e7-3b63-a0e3-810016c2a615",
+  "request": {
+    "url": "/marketplace_listing/plans/9/accounts?sort=updated&direction=desc",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:58:11 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4985",
-      "X-RateLimit-Reset" : "1575878183",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"c380429122e5063651ab282a7daf8e8a\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDE1:0E13:2111062:25A0DF5:5DEDF082"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-9-accounts-VT77w.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:58:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4985",
+      "X-RateLimit-Reset": "1575878183",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c380429122e5063651ab282a7daf8e8a\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDE1:0E13:2111062:25A0DF5:5DEDF082"
     }
   },
-  "uuid" : "96ec4464-54e7-3b63-a0e3-810016c2a615"
+  "uuid": "96ec4464-54e7-3b63-a0e3-810016c2a615"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-xk1MF.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-xk1MF.json
index fb27a1d89f..7fd81a1539 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-xk1MF.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listAccountsWithSortAndDirection/mappings/mapping-marketplace_listing-stubbed-plans-xk1MF.json
@@ -1,40 +1,43 @@
 {
-  "id" : "e1c72a1d-7cae-3b19-a4cf-15da68b417cb",
-  "request" : {
-    "url" : "/marketplace_listing/plans",
-    "method" : "GET",
+  "id": "e1c72a1d-7cae-3b19-a4cf-15da68b417cb",
+  "request": {
+    "url": "/marketplace_listing/plans",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-xk1MF.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 06:58:09 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4988",
-      "X-RateLimit-Reset" : "1575878183",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "EDE1:0E13:2111039:25A0DC7:5DEDF081"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-xk1MF.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 06:58:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1575878183",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EDE1:0E13:2111039:25A0DC7:5DEDF081"
     }
   },
-  "uuid" : "e1c72a1d-7cae-3b19-a4cf-15da68b417cb"
+  "uuid": "e1c72a1d-7cae-3b19-a4cf-15da68b417cb"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/mappings/mapping-marketplace_listing-stubbed-plans-ZDjdu.json b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/mappings/mapping-marketplace_listing-stubbed-plans-ZDjdu.json
index bd04fc5393..168bc43f08 100644
--- a/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/mappings/mapping-marketplace_listing-stubbed-plans-ZDjdu.json
+++ b/src/test/resources/org/kohsuke/github/GHMarketplacePlanTest/wiremock/listMarketplacePlans/mappings/mapping-marketplace_listing-stubbed-plans-ZDjdu.json
@@ -1,40 +1,43 @@
 {
-  "id" : "6634cef2-c523-31b2-905b-e38c1922b9f5",
-  "request" : {
-    "url" : "/marketplace_listing/plans",
-    "method" : "GET",
+  "id": "6634cef2-c523-31b2-905b-e38c1922b9f5",
+  "request": {
+    "url": "/marketplace_listing/plans",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-marketplace_listing-stubbed-plans-ZDjdu.json",
-    "headers" : {
-      "Date" : "Sun, 08 Dec 2019 06:34:20 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4988",
-      "X-RateLimit-Reset" : "1575790406",
-      "Cache-Control" : "public, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept", "Accept-Encoding" ],
-      "ETag" : "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "DD02:3ED0:1A1F6B3:1D93642:5DEC996C"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-marketplace_listing-stubbed-plans-ZDjdu.json",
+    "headers": {
+      "Date": "Sun, 08 Dec 2019 06:34:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1575790406",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0e89a15f784bd1814d5ae4b05de78ab7\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DD02:3ED0:1A1F6B3:1D93642:5DEC996C"
     }
   },
-  "uuid" : "6634cef2-c523-31b2-905b-e38c1922b9f5"
+  "uuid": "6634cef2-c523-31b2-905b-e38c1922b9f5"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/orgs_github-api-test-org-fdbcaf38-478b-440a-851a-b5913757f6f3.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/orgs_github-api-test-org-fdbcaf38-478b-440a-851a-b5913757f6f3.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api-701999a2-14ad-4078-ab89-b0f722cbc52f.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api-701999a2-14ad-4078-ab89-b0f722cbc52f.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones-a7ebf1ae-cbbb-4c59-8844-6888ad2493ba.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones-a7ebf1ae-cbbb-4c59-8844-6888ad2493ba.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-80930c65-6614-40e9-8cfb-51244eb49764.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-80930c65-6614-40e9-8cfb-51244eb49764.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-865125bf-0f31-4650-b668-9d5d72c47680.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-865125bf-0f31-4650-b668-9d5d72c47680.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-b24a5b3a-76c0-44f6-950b-d0fdec878349.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-b24a5b3a-76c0-44f6-950b-d0fdec878349.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-fffe46e8-0b2e-4195-8e42-857e3127cd0b.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-fffe46e8-0b2e-4195-8e42-857e3127cd0b.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/repos_github-api-test-org_github-api_milestones_2-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/user-7feb269c-7db0-4c3f-8c58-f99bdf1cafe8.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/user-7feb269c-7db0-4c3f-8c58-f99bdf1cafe8.json
rename to src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2-fdbcaf.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2-fdbcaf.json
deleted file mode 100644
index f43cfda6f2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2-fdbcaf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fdbcaf38-478b-440a-851a-b5913757f6f3",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-fdbcaf38-478b-440a-851a-b5913757f6f3.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 22:04:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AA4:B171A:5DBA08E2"
-    }
-  },
-  "uuid": "fdbcaf38-478b-440a-851a-b5913757f6f3",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..489566a001
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "fdbcaf38-478b-440a-851a-b5913757f6f3",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 22:04:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AA4:B171A:5DBA08E2"
+    }
+  },
+  "uuid": "fdbcaf38-478b-440a-851a-b5913757f6f3",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3-701999.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3-701999.json
deleted file mode 100644
index ba982277ed..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3-701999.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "701999a2-14ad-4078-ab89-b0f722cbc52f",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-701999a2-14ad-4078-ab89-b0f722cbc52f.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 22:04:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"50590b38f0a75703e69533e84bda5c10\"",
-      "Last-Modified": "Wed, 30 Oct 2019 01:54:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AA6:B173A:5DBA08E4"
-    }
-  },
-  "uuid": "701999a2-14ad-4078-ab89-b0f722cbc52f",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..418dc1b8fd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "701999a2-14ad-4078-ab89-b0f722cbc52f",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 22:04:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"50590b38f0a75703e69533e84bda5c10\"",
+      "Last-Modified": "Wed, 30 Oct 2019 01:54:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AA6:B173A:5DBA08E4"
+    }
+  },
+  "uuid": "701999a2-14ad-4078-ab89-b0f722cbc52f",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4-a7ebf1.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4-a7ebf1.json
deleted file mode 100644
index 487c433465..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4-a7ebf1.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "a7ebf1ae-cbbb-4c59-8844-6888ad2493ba",
-  "name": "repos_github-api-test-org_github-api_milestones",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/milestones",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"To test the update methods\",\"title\":\"Original Title\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_milestones-a7ebf1ae-cbbb-4c59-8844-6888ad2493ba.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 30 Oct 2019 22:04:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "\"ce66f12f4b019a623862f9099dd8ac06\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/milestones/2",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AA9:B173C:5DBA08E4"
-    }
-  },
-  "uuid": "a7ebf1ae-cbbb-4c59-8844-6888ad2493ba",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4.json
new file mode 100644
index 0000000000..74622c507c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones-4.json
@@ -0,0 +1,52 @@
+{
+  "id": "a7ebf1ae-cbbb-4c59-8844-6888ad2493ba",
+  "name": "repos_github-api-test-org_github-api_milestones",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/milestones",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"To test the update methods\",\"title\":\"Original Title\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_milestones-4.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 30 Oct 2019 22:04:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4948",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "\"ce66f12f4b019a623862f9099dd8ac06\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/milestones/2",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AA9:B173C:5DBA08E4"
+    }
+  },
+  "uuid": "a7ebf1ae-cbbb-4c59-8844-6888ad2493ba",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5-80930c.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5-80930c.json
deleted file mode 100644
index f773c1489d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5-80930c.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "80930c65-6614-40e9-8cfb-51244eb49764",
-  "name": "repos_github-api-test-org_github-api_milestones_2",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/milestones/2",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"title\":\"Updated Title\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-80930c65-6614-40e9-8cfb-51244eb49764.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"870c796ce201b8d104442df63f095b43\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AAB:B1740:5DBA08E4"
-    }
-  },
-  "uuid": "80930c65-6614-40e9-8cfb-51244eb49764",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5.json
new file mode 100644
index 0000000000..19bc4db774
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "80930c65-6614-40e9-8cfb-51244eb49764",
+  "name": "repos_github-api-test-org_github-api_milestones_2",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/milestones/2",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Updated Title\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-5.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4947",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"870c796ce201b8d104442df63f095b43\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AAB:B1740:5DBA08E4"
+    }
+  },
+  "uuid": "80930c65-6614-40e9-8cfb-51244eb49764",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6-865125.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6-865125.json
deleted file mode 100644
index 5e85f66220..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6-865125.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "865125bf-0f31-4650-b668-9d5d72c47680",
-  "name": "repos_github-api-test-org_github-api_milestones_2",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/milestones/2",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"Updated Description\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-865125bf-0f31-4650-b668-9d5d72c47680.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"d4dd5030d06a729043f3d03079e9fe3d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AAE:B1744:5DBA08E5"
-    }
-  },
-  "uuid": "865125bf-0f31-4650-b668-9d5d72c47680",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6.json
new file mode 100644
index 0000000000..aac2be80ef
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "865125bf-0f31-4650-b668-9d5d72c47680",
+  "name": "repos_github-api-test-org_github-api_milestones_2",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/milestones/2",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"Updated Description\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-6.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"d4dd5030d06a729043f3d03079e9fe3d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AAE:B1744:5DBA08E5"
+    }
+  },
+  "uuid": "865125bf-0f31-4650-b668-9d5d72c47680",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7-b24a5b.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7-b24a5b.json
deleted file mode 100644
index 4471a7daa8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7-b24a5b.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "b24a5b3a-76c0-44f6-950b-d0fdec878349",
-  "name": "repos_github-api-test-org_github-api_milestones_2",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/milestones/2",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"due_on\":\"2020-10-05T13:00:00Z\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-b24a5b3a-76c0-44f6-950b-d0fdec878349.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4945",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f6b5158570f599d271e8d001b807457e\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AB1:B1749:5DBA08E5"
-    }
-  },
-  "uuid": "b24a5b3a-76c0-44f6-950b-d0fdec878349",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7.json
new file mode 100644
index 0000000000..2e3ad42e4d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-7.json
@@ -0,0 +1,54 @@
+{
+  "id": "b24a5b3a-76c0-44f6-950b-d0fdec878349",
+  "name": "repos_github-api-test-org_github-api_milestones_2",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/milestones/2",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"due_on\":\"2020-10-05T13:00:00Z\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-7.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4945",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f6b5158570f599d271e8d001b807457e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AB1:B1749:5DBA08E5"
+    }
+  },
+  "uuid": "b24a5b3a-76c0-44f6-950b-d0fdec878349",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8-fffe46.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8-fffe46.json
deleted file mode 100644
index 7907e39227..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8-fffe46.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fffe46e8-0b2e-4195-8e42-857e3127cd0b",
-  "name": "repos_github-api-test-org_github-api_milestones_2",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/milestones/2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-fffe46e8-0b2e-4195-8e42-857e3127cd0b.json",
-    "headers": {
-      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4944",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f6b5158570f599d271e8d001b807457e\"",
-      "Last-Modified": "Wed, 30 Oct 2019 22:04:21 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64AB3:B174F:5DBA08E5"
-    }
-  },
-  "uuid": "fffe46e8-0b2e-4195-8e42-857e3127cd0b",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8.json
new file mode 100644
index 0000000000..f81c52f39c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/repos_github-api-test-org_github-api_milestones_2-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "fffe46e8-0b2e-4195-8e42-857e3127cd0b",
+  "name": "repos_github-api-test-org_github-api_milestones_2",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/milestones/2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_milestones_2-8.json",
+    "headers": {
+      "Date": "Wed, 30 Oct 2019 22:04:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4944",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f6b5158570f599d271e8d001b807457e\"",
+      "Last-Modified": "Wed, 30 Oct 2019 22:04:21 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64AB3:B174F:5DBA08E5"
+    }
+  },
+  "uuid": "fffe46e8-0b2e-4195-8e42-857e3127cd0b",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1-7feb26.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1-7feb26.json
deleted file mode 100644
index 68bcf58253..0000000000
--- a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1-7feb26.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "7feb269c-7db0-4c3f-8c58-f99bdf1cafe8",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-7feb269c-7db0-4c3f-8c58-f99bdf1cafe8.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 30 Oct 2019 22:04:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4955",
-      "X-RateLimit-Reset": "1572476616",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F2AC:26CD:64A8F:B1718:5DBA08E2"
-    }
-  },
-  "uuid": "7feb269c-7db0-4c3f-8c58-f99bdf1cafe8",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1.json
new file mode 100644
index 0000000000..0a777a2947
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHMilestoneTest/wiremock/testUpdateMilestone/mappings/user-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "7feb269c-7db0-4c3f-8c58-f99bdf1cafe8",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 30 Oct 2019 22:04:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4955",
+      "X-RateLimit-Reset": "1572476616",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2AC:26CD:64A8F:B1718:5DBA08E2"
+    }
+  },
+  "uuid": "7feb269c-7db0-4c3f-8c58-f99bdf1cafe8",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/orgs_github-api-test-org-11718658-38aa-4629-bcf3-48d5ca5fd31b.json b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/orgs_github-api-test-org-11718658-38aa-4629-bcf3-48d5ca5fd31b.json
rename to src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/user-1609473b-b4ea-4a80-85dd-2c77586f7683.json b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/user-1609473b-b4ea-4a80-85dd-2c77586f7683.json
rename to src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2-117186.json b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2-117186.json
deleted file mode 100644
index 23c83eb8af..0000000000
--- a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2-117186.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "11718658-38aa-4629-bcf3-48d5ca5fd31b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-11718658-38aa-4629-bcf3-48d5ca5fd31b.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 16:21:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1575480063",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1de516fab0228945881043c1bc527c88\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A58B:3BB71:11A5D692:150716D8:5DE7DCEF"
-    }
-  },
-  "uuid": "11718658-38aa-4629-bcf3-48d5ca5fd31b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..9751149fe4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "11718658-38aa-4629-bcf3-48d5ca5fd31b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 16:21:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1575480063",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1de516fab0228945881043c1bc527c88\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A58B:3BB71:11A5D692:150716D8:5DE7DCEF"
+    }
+  },
+  "uuid": "11718658-38aa-4629-bcf3-48d5ca5fd31b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1-160947.json b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1-160947.json
deleted file mode 100644
index d81e207bdf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1-160947.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1609473b-b4ea-4a80-85dd-2c77586f7683",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1609473b-b4ea-4a80-85dd-2c77586f7683.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 16:21:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1575480063",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"120f406a3c8014eb0bcbd531eab5a54a\"",
-      "Last-Modified": "Mon, 02 Dec 2019 20:08:02 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A58B:3BB71:11A5D462:1507160A:5DE7DCEE"
-    }
-  },
-  "uuid": "1609473b-b4ea-4a80-85dd-2c77586f7683",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1.json
new file mode 100644
index 0000000000..e329281d25
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHObjectTest/wiremock/test_toString/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1609473b-b4ea-4a80-85dd-2c77586f7683",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 16:21:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1575480063",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"120f406a3c8014eb0bcbd531eab5a54a\"",
+      "Last-Modified": "Mon, 02 Dec 2019 20:08:02 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A58B:3BB71:11A5D462:1507160A:5DE7DCEE"
+    }
+  },
+  "uuid": "1609473b-b4ea-4a80-85dd-2c77586f7683",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org-b4a28742-c15b-4b7d-a6ce-45b33efa8289.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org-b4a28742-c15b-4b7d-a6ce-45b33efa8289.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org_teams-6d91c5d6-a8a1-4693-9b2a-dc136570b11b.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org_teams-6d91c5d6-a8a1-4693-9b2a-dc136570b11b.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/user-b4c30850-48c1-46f6-83a4-52b7a1ff4765.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/user-b4c30850-48c1-46f6-83a4-52b7a1ff4765.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2-b4a287.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2-b4a287.json
deleted file mode 100644
index 2632333e9e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2-b4a287.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b4a28742-c15b-4b7d-a6ce-45b33efa8289",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b4a28742-c15b-4b7d-a6ce-45b33efa8289.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 19:41:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1579982958",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"977dd50269f5d021b7fe0e4870411bf3\"",
-      "Last-Modified": "Mon, 07 Oct 2019 20:06:18 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D779:3EC91:442CAF:51E2F8:5E2C99F6"
-    }
-  },
-  "uuid": "b4a28742-c15b-4b7d-a6ce-45b33efa8289",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..6541e0adff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b4a28742-c15b-4b7d-a6ce-45b33efa8289",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 19:41:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1579982958",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"977dd50269f5d021b7fe0e4870411bf3\"",
+      "Last-Modified": "Mon, 07 Oct 2019 20:06:18 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D779:3EC91:442CAF:51E2F8:5E2C99F6"
+    }
+  },
+  "uuid": "b4a28742-c15b-4b7d-a6ce-45b33efa8289",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3-6d91c5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3-6d91c5.json
deleted file mode 100644
index bb4d8e99a9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3-6d91c5.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "6d91c5d6-a8a1-4693-9b2a-dc136570b11b",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"maintainers\":[\"bitwiseman\"],\"parent_team_id\":3617900,\"name\":\"create-team-test\",\"repo_names\":[\"github-api\"],\"description\":\"Team description\",\"privacy\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_teams-6d91c5d6-a8a1-4693-9b2a-dc136570b11b.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 19:41:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1579982959",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"d3d6756d8fe199b3859b98ac3e64e321\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "Location": "https://api.github.com/organizations/49127317/team/3618001",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D779:3EC91:442CB3:51E304:5E2C99F8"
-    }
-  },
-  "uuid": "6d91c5d6-a8a1-4693-9b2a-dc136570b11b",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..8541eff55a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "6d91c5d6-a8a1-4693-9b2a-dc136570b11b",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"maintainers\":[\"bitwiseman\"],\"parent_team_id\":3617900,\"name\":\"create-team-test\",\"repo_names\":[\"github-api\"],\"description\":\"Team description\",\"privacy\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 19:41:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1579982959",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d3d6756d8fe199b3859b98ac3e64e321\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "Location": "https://api.github.com/organizations/49127317/team/3618001",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D779:3EC91:442CB3:51E304:5E2C99F8"
+    }
+  },
+  "uuid": "6d91c5d6-a8a1-4693-9b2a-dc136570b11b",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1-b4c308.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1-b4c308.json
deleted file mode 100644
index e91c568ede..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1-b4c308.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b4c30850-48c1-46f6-83a4-52b7a1ff4765",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b4c30850-48c1-46f6-83a4-52b7a1ff4765.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 19:41:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4937",
-      "X-RateLimit-Reset": "1579982959",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8ff93ad1eb46d27ae66bf8ddc6803adf\"",
-      "Last-Modified": "Sat, 25 Jan 2020 14:47:46 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D779:3EC91:442CA6:51E2F5:5E2C99F6"
-    }
-  },
-  "uuid": "b4c30850-48c1-46f6-83a4-52b7a1ff4765",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1.json
new file mode 100644
index 0000000000..32ed4fe531
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateAllArgsTeam/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b4c30850-48c1-46f6-83a4-52b7a1ff4765",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 19:41:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4937",
+      "X-RateLimit-Reset": "1579982959",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8ff93ad1eb46d27ae66bf8ddc6803adf\"",
+      "Last-Modified": "Sat, 25 Jan 2020 14:47:46 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D779:3EC91:442CA6:51E2F5:5E2C99F6"
+    }
+  },
+  "uuid": "b4c30850-48c1-46f6-83a4-52b7a1ff4765",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org-cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org-cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_repos-43cfd527-8dc8-4025-ab6f-41f6c45a86bd.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_repos-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_repos-43cfd527-8dc8-4025-ab6f-41f6c45a86bd.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_repos-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_teams-beb3badb-dca2-4515-9c19-9ba8401f98f4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_teams-beb3badb-dca2-4515-9c19-9ba8401f98f4.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/user-58ae6686-1748-4884-8b04-c483ac0bf048.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/user-58ae6686-1748-4884-8b04-c483ac0bf048.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2-cf0714.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2-cf0714.json
deleted file mode 100644
index a5a8b07372..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2-cf0714.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4909",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAEC:67D2:2959FE:324484:5D9665AF"
-    }
-  },
-  "uuid": "cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..b470e031e3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4909",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAEC:67D2:2959FE:324484:5D9665AF"
+    }
+  },
+  "uuid": "cf0714bb-fa4e-4d8b-8e74-05a7b3c11a5b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4-43cfd5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4-43cfd5.json
deleted file mode 100644
index 1331bcc80d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4-43cfd5.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "43cfd527-8dc8-4025-ab6f-41f6c45a86bd",
-  "name": "orgs_github-api-test-org_repos",
-  "request": {
-    "url": "/orgs/github-api-test-org/repos",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"private\":false,\"name\":\"github-api-test\",\"description\":\"a test repository used to test kohsuke's github-api\",\"team_id\":820406,\"homepage\":\"http://github-api.kohsuke.org/\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_repos-43cfd527-8dc8-4025-ab6f-41f6c45a86bd.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"5cf0101d2b4d7a8ec5172c86f1adf28a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAEC:67D2:295A08:3244A9:5D9665B0"
-    }
-  },
-  "uuid": "43cfd527-8dc8-4025-ab6f-41f6c45a86bd",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4.json
new file mode 100644
index 0000000000..9d813c03e8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_repos-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "43cfd527-8dc8-4025-ab6f-41f6c45a86bd",
+  "name": "orgs_github-api-test-org_repos",
+  "request": {
+    "url": "/orgs/github-api-test-org/repos",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":false,\"name\":\"github-api-test\",\"description\":\"a test repository used to test kohsuke's github-api\",\"team_id\":820406,\"homepage\":\"http://github-api.kohsuke.org/\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_repos-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4907",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"5cf0101d2b4d7a8ec5172c86f1adf28a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAEC:67D2:295A08:3244A9:5D9665B0"
+    }
+  },
+  "uuid": "43cfd527-8dc8-4025-ab6f-41f6c45a86bd",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3-beb3ba.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3-beb3ba.json
deleted file mode 100644
index 481b00f246..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3-beb3ba.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "beb3badb-dca2-4515-9c19-9ba8401f98f4",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-beb3badb-dca2-4515-9c19-9ba8401f98f4.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAEC:67D2:295A04:3244A1:5D9665B0"
-    }
-  },
-  "uuid": "beb3badb-dca2-4515-9c19-9ba8401f98f4",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..eeefb8182e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "beb3badb-dca2-4515-9c19-9ba8401f98f4",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAEC:67D2:295A04:3244A1:5D9665B0"
+    }
+  },
+  "uuid": "beb3badb-dca2-4515-9c19-9ba8401f98f4",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1-58ae66.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1-58ae66.json
deleted file mode 100644
index 055450176b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1-58ae66.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "58ae6686-1748-4884-8b04-c483ac0bf048",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-58ae6686-1748-4884-8b04-c483ac0bf048.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4913",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAEC:67D2:2959E5:324480:5D9665AF"
-    }
-  },
-  "uuid": "58ae6686-1748-4884-8b04-c483ac0bf048",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1.json
new file mode 100644
index 0000000000..f6e9d3d436
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepository/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "58ae6686-1748-4884-8b04-c483ac0bf048",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4913",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAEC:67D2:2959E5:324480:5D9665AF"
+    }
+  },
+  "uuid": "58ae6686-1748-4884-8b04-c483ac0bf048",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org-7b0ac54c-1ef0-453a-99db-a480b3b5a746.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org-7b0ac54c-1ef0-453a-99db-a480b3b5a746.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_repos-423c774e-3d61-423a-ad0d-ee166bf2b4de.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_repos-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_repos-423c774e-3d61-423a-ad0d-ee166bf2b4de.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_repos-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_teams-eb06b2d9-1dda-4070-bdfe-3005f550e7ec.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_teams-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_teams-eb06b2d9-1dda-4070-bdfe-3005f550e7ec.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/orgs_github-api-test-org_teams-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/repos_github-api-test-org_github-api-test_readme-12092c16-85de-454a-80ae-61c283738838.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/repos_github-api-test-org_github-api-test_readme-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/repos_github-api-test-org_github-api-test_readme-12092c16-85de-454a-80ae-61c283738838.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/repos_github-api-test-org_github-api-test_readme-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/user-d246cfb6-e28a-417b-8d74-29080bbc1c4c.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/user-d246cfb6-e28a-417b-8d74-29080bbc1c4c.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2-7b0ac5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2-7b0ac5.json
deleted file mode 100644
index df454389c8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2-7b0ac5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7b0ac54c-1ef0-453a-99db-a480b3b5a746",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-7b0ac54c-1ef0-453a-99db-a480b3b5a746.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11DD:8037AC:5D9665B2"
-    }
-  },
-  "uuid": "7b0ac54c-1ef0-453a-99db-a480b3b5a746",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..fe356b5670
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7b0ac54c-1ef0-453a-99db-a480b3b5a746",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4900",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF1:9576:6B11DD:8037AC:5D9665B2"
+    }
+  },
+  "uuid": "7b0ac54c-1ef0-453a-99db-a480b3b5a746",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4-423c77.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4-423c77.json
deleted file mode 100644
index 260688394b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4-423c77.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "423c774e-3d61-423a-ad0d-ee166bf2b4de",
-  "name": "orgs_github-api-test-org_repos",
-  "request": {
-    "url": "/orgs/github-api-test-org/repos",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"auto_init\":true,\"name\":\"github-api-test\",\"description\":\"a test repository used to test kohsuke's github-api\",\"team_id\":820406,\"homepage\":\"http://github-api.kohsuke.org/\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_repos-423c774e-3d61-423a-ad0d-ee166bf2b4de.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4898",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"2b3e3ea59f28d3dadc92e7bb9aa81918\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11EA:8037CF:5D9665B3"
-    }
-  },
-  "uuid": "423c774e-3d61-423a-ad0d-ee166bf2b4de",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4.json
new file mode 100644
index 0000000000..d21b8ae356
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_repos-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "423c774e-3d61-423a-ad0d-ee166bf2b4de",
+  "name": "orgs_github-api-test-org_repos",
+  "request": {
+    "url": "/orgs/github-api-test-org/repos",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"auto_init\":true,\"name\":\"github-api-test\",\"description\":\"a test repository used to test kohsuke's github-api\",\"team_id\":820406,\"homepage\":\"http://github-api.kohsuke.org/\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_repos-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4898",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"2b3e3ea59f28d3dadc92e7bb9aa81918\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api-test",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF1:9576:6B11EA:8037CF:5D9665B3"
+    }
+  },
+  "uuid": "423c774e-3d61-423a-ad0d-ee166bf2b4de",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3-eb06b2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3-eb06b2.json
deleted file mode 100644
index 4b903331d8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3-eb06b2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "eb06b2d9-1dda-4070-bdfe-3005f550e7ec",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-eb06b2d9-1dda-4070-bdfe-3005f550e7ec.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11E4:8037CB:5D9665B3"
-    }
-  },
-  "uuid": "eb06b2d9-1dda-4070-bdfe-3005f550e7ec",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3.json
new file mode 100644
index 0000000000..a153dadc61
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/orgs_github-api-test-org_teams-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "eb06b2d9-1dda-4070-bdfe-3005f550e7ec",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4899",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF1:9576:6B11E4:8037CB:5D9665B3"
+    }
+  },
+  "uuid": "eb06b2d9-1dda-4070-bdfe-3005f550e7ec",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5-12092c.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5-12092c.json
deleted file mode 100644
index a8207b2ff6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5-12092c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "12092c16-85de-454a-80ae-61c283738838",
-  "name": "repos_github-api-test-org_github-api-test_readme",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api-test/readme",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-test_readme-12092c16-85de-454a-80ae-61c283738838.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cabb44de69d6ea06b2d8ca4bb5b01405\"",
-      "Last-Modified": "Thu, 03 Oct 2019 21:18:44 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B1234:803821:5D9665B5"
-    }
-  },
-  "uuid": "12092c16-85de-454a-80ae-61c283738838",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5.json
new file mode 100644
index 0000000000..ee270ec9a7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/repos_github-api-test-org_github-api-test_readme-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "12092c16-85de-454a-80ae-61c283738838",
+  "name": "repos_github-api-test-org_github-api-test_readme",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api-test/readme",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-test_readme-5.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cabb44de69d6ea06b2d8ca4bb5b01405\"",
+      "Last-Modified": "Thu, 03 Oct 2019 21:18:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF1:9576:6B1234:803821:5D9665B5"
+    }
+  },
+  "uuid": "12092c16-85de-454a-80ae-61c283738838",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1-d246cf.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1-d246cf.json
deleted file mode 100644
index b6b24bdfbd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1-d246cf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d246cfb6-e28a-417b-8d74-29080bbc1c4c",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d246cfb6-e28a-417b-8d74-29080bbc1c4c.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4904",
-      "X-RateLimit-Reset": "1570140015",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11BA:80379D:5D9665B2"
-    }
-  },
-  "uuid": "d246cfb6-e28a-417b-8d74-29080bbc1c4c",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1.json
new file mode 100644
index 0000000000..81eb1a6dc4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithAutoInitialization/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d246cfb6-e28a-417b-8d74-29080bbc1c4c",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:18:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4904",
+      "X-RateLimit-Reset": "1570140015",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF1:9576:6B11BA:80379D:5D9665B2"
+    }
+  },
+  "uuid": "d246cfb6-e28a-417b-8d74-29080bbc1c4c",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org-b46fc09e-f6b1-470b-b070-d37c25eb5096.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org-b46fc09e-f6b1-470b-b070-d37c25eb5096.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org_teams-93bbb3e2-5dd1-41f1-b527-1e431a0213b7.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org_teams-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org_teams-93bbb3e2-5dd1-41f1-b527-1e431a0213b7.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/orgs_github-api-test-org_teams-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/repos_github-api-test-org_github-api-8907242a-a66e-45d4-a01e-3f12bfa099a2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/repos_github-api-test-org_github-api-8907242a-a66e-45d4-a01e-3f12bfa099a2.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/teams_3531422_repos-9893d54e-bc2f-4246-ba25-b9c157b22845.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/teams_3531422_repos-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/teams_3531422_repos-9893d54e-bc2f-4246-ba25-b9c157b22845.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/teams_3531422_repos-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/user-3a6b16d8-0d7e-4409-bb25-07ac6103a4fd.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/user-3a6b16d8-0d7e-4409-bb25-07ac6103a4fd.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2-b46fc0.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2-b46fc0.json
deleted file mode 100644
index de49b5ffbb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2-b46fc0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b46fc09e-f6b1-470b-b070-d37c25eb5096",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b46fc09e-f6b1-470b-b070-d37c25eb5096.json",
-    "headers": {
-      "Date": "Wed, 20 Nov 2019 01:07:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4941",
-      "X-RateLimit-Reset": "1574215499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"06bf8d27c18bdcae52cacdb1c04e5618\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "84E8:8C36:9EA5B0:B90507:5DD491EC"
-    }
-  },
-  "uuid": "b46fc09e-f6b1-470b-b070-d37c25eb5096",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..fb0c399e67
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b46fc09e-f6b1-470b-b070-d37c25eb5096",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 20 Nov 2019 01:07:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1574215499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"06bf8d27c18bdcae52cacdb1c04e5618\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "84E8:8C36:9EA5B0:B90507:5DD491EC"
+    }
+  },
+  "uuid": "b46fc09e-f6b1-470b-b070-d37c25eb5096",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4-93bbb3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4-93bbb3.json
deleted file mode 100644
index 521531a1b8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4-93bbb3.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "93bbb3e2-5dd1-41f1-b527-1e431a0213b7",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"create-team-test\",\"repo_names\":[\"github-api-test-org/github-api\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_teams-93bbb3e2-5dd1-41f1-b527-1e431a0213b7.json",
-    "headers": {
-      "Date": "Wed, 20 Nov 2019 01:07:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4939",
-      "X-RateLimit-Reset": "1574215499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"454ab73d1808f8bc3abc9478505ad221\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "Location": "https://api.github.com/teams/3531422",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "84E8:8C36:9EA5E9:B90588:5DD491ED"
-    }
-  },
-  "uuid": "93bbb3e2-5dd1-41f1-b527-1e431a0213b7",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4.json
new file mode 100644
index 0000000000..642a2bba37
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/orgs_github-api-test-org_teams-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "93bbb3e2-5dd1-41f1-b527-1e431a0213b7",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"create-team-test\",\"repo_names\":[\"github-api-test-org/github-api\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_teams-4.json",
+    "headers": {
+      "Date": "Wed, 20 Nov 2019 01:07:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4939",
+      "X-RateLimit-Reset": "1574215499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"454ab73d1808f8bc3abc9478505ad221\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "Location": "https://api.github.com/teams/3531422",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "84E8:8C36:9EA5E9:B90588:5DD491ED"
+    }
+  },
+  "uuid": "93bbb3e2-5dd1-41f1-b527-1e431a0213b7",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3-890724.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3-890724.json
deleted file mode 100644
index d2929d519e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3-890724.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8907242a-a66e-45d4-a01e-3f12bfa099a2",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-8907242a-a66e-45d4-a01e-3f12bfa099a2.json",
-    "headers": {
-      "Date": "Wed, 20 Nov 2019 01:07:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4940",
-      "X-RateLimit-Reset": "1574215499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5f93d5d1afae66d9e8f982e4cad293b6\"",
-      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "84E8:8C36:9EA5C8:B9056B:5DD491EC"
-    }
-  },
-  "uuid": "8907242a-a66e-45d4-a01e-3f12bfa099a2",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..61ec9a101c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "8907242a-a66e-45d4-a01e-3f12bfa099a2",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Wed, 20 Nov 2019 01:07:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4940",
+      "X-RateLimit-Reset": "1574215499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5f93d5d1afae66d9e8f982e4cad293b6\"",
+      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "84E8:8C36:9EA5C8:B9056B:5DD491EC"
+    }
+  },
+  "uuid": "8907242a-a66e-45d4-a01e-3f12bfa099a2",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5-9893d5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5-9893d5.json
deleted file mode 100644
index 81b915127a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5-9893d5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "9893d54e-bc2f-4246-ba25-b9c157b22845",
-  "name": "teams_3531422_repos",
-  "request": {
-    "url": "/teams/3531422/repos",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3531422_repos-9893d54e-bc2f-4246-ba25-b9c157b22845.json",
-    "headers": {
-      "Date": "Wed, 20 Nov 2019 01:07:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4938",
-      "X-RateLimit-Reset": "1574215499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"56e4bb5283d34fc86bf30247ae56cfbd\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "84E8:8C36:9EA654:B9060A:5DD491EE"
-    }
-  },
-  "uuid": "9893d54e-bc2f-4246-ba25-b9c157b22845",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5.json
new file mode 100644
index 0000000000..1bb4cc68a7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/teams_3531422_repos-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "9893d54e-bc2f-4246-ba25-b9c157b22845",
+  "name": "teams_3531422_repos",
+  "request": {
+    "url": "/teams/3531422/repos",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3531422_repos-5.json",
+    "headers": {
+      "Date": "Wed, 20 Nov 2019 01:07:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4938",
+      "X-RateLimit-Reset": "1574215499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"56e4bb5283d34fc86bf30247ae56cfbd\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "84E8:8C36:9EA654:B9060A:5DD491EE"
+    }
+  },
+  "uuid": "9893d54e-bc2f-4246-ba25-b9c157b22845",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1-3a6b16.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1-3a6b16.json
deleted file mode 100644
index 730319aa42..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1-3a6b16.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3a6b16d8-0d7e-4409-bb25-07ac6103a4fd",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3a6b16d8-0d7e-4409-bb25-07ac6103a4fd.json",
-    "headers": {
-      "Date": "Wed, 20 Nov 2019 01:07:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4945",
-      "X-RateLimit-Reset": "1574215499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3d6980508567a2e87daa452d20106bcd\"",
-      "Last-Modified": "Tue, 19 Nov 2019 18:23:21 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "84E8:8C36:9EA55D:B904F1:5DD491EC"
-    }
-  },
-  "uuid": "3a6b16d8-0d7e-4409-bb25-07ac6103a4fd",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1.json
new file mode 100644
index 0000000000..dc1e75ad93
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeam/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "3a6b16d8-0d7e-4409-bb25-07ac6103a4fd",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 20 Nov 2019 01:07:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4945",
+      "X-RateLimit-Reset": "1574215499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3d6980508567a2e87daa452d20106bcd\"",
+      "Last-Modified": "Tue, 19 Nov 2019 18:23:21 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "84E8:8C36:9EA55D:B904F1:5DD491EC"
+    }
+  },
+  "uuid": "3a6b16d8-0d7e-4409-bb25-07ac6103a4fd",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org-8c23f18e-d928-4e88-851d-fa36feecf615.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org-8c23f18e-d928-4e88-851d-fa36feecf615.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org_teams-3459b05f-6e47-4c41-be60-83c125bf180b.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org_teams-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org_teams-3459b05f-6e47-4c41-be60-83c125bf180b.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/orgs_github-api-test-org_teams-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/repos_github-api-test-org_github-api-25876edf-6351-4b59-9e1d-82886a02f721.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/repos_github-api-test-org_github-api-25876edf-6351-4b59-9e1d-82886a02f721.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/teams_3501817_repos-97bad23b-9d25-4db2-8420-afbc40b450ac.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/teams_3501817_repos-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/teams_3501817_repos-97bad23b-9d25-4db2-8420-afbc40b450ac.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/teams_3501817_repos-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/user-8620f09e-7f34-4e00-860b-335d22d56f92.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/user-8620f09e-7f34-4e00-860b-335d22d56f92.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2-8c23f1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2-8c23f1.json
deleted file mode 100644
index 8b9a11c59a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2-8c23f1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8c23f18e-d928-4e88-851d-fa36feecf615",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-8c23f18e-d928-4e88-851d-fa36feecf615.json",
-    "headers": {
-      "Date": "Fri, 01 Nov 2019 16:29:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1572629252",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D319:5DFB:15D51C7:19DE151:5DBC5D53"
-    }
-  },
-  "uuid": "8c23f18e-d928-4e88-851d-fa36feecf615",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..df1da59d49
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "8c23f18e-d928-4e88-851d-fa36feecf615",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 01 Nov 2019 16:29:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1572629252",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D319:5DFB:15D51C7:19DE151:5DBC5D53"
+    }
+  },
+  "uuid": "8c23f18e-d928-4e88-851d-fa36feecf615",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4-3459b0.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4-3459b0.json
deleted file mode 100644
index 4e16e68dc7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4-3459b0.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "3459b05f-6e47-4c41-be60-83c125bf180b",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"create-team-test\",\"repo_names\":[\"github-api-test-org/github-api\"],\"permission\":\"push\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_teams-3459b05f-6e47-4c41-be60-83c125bf180b.json",
-    "headers": {
-      "Date": "Fri, 01 Nov 2019 16:29:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1572629252",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"107dcb6fe97e7e3aa92c5751075dec52\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "Location": "https://api.github.com/teams/3501817",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D319:5DFB:15D51FE:19DE222:5DBC5D55"
-    }
-  },
-  "uuid": "3459b05f-6e47-4c41-be60-83c125bf180b",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4.json
new file mode 100644
index 0000000000..88d4f03b0c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/orgs_github-api-test-org_teams-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "3459b05f-6e47-4c41-be60-83c125bf180b",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"create-team-test\",\"repo_names\":[\"github-api-test-org/github-api\"],\"permission\":\"push\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_teams-4.json",
+    "headers": {
+      "Date": "Fri, 01 Nov 2019 16:29:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1572629252",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"107dcb6fe97e7e3aa92c5751075dec52\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "Location": "https://api.github.com/teams/3501817",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D319:5DFB:15D51FE:19DE222:5DBC5D55"
+    }
+  },
+  "uuid": "3459b05f-6e47-4c41-be60-83c125bf180b",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3-25876e.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3-25876e.json
deleted file mode 100644
index 81781a061f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3-25876e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "25876edf-6351-4b59-9e1d-82886a02f721",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-25876edf-6351-4b59-9e1d-82886a02f721.json",
-    "headers": {
-      "Date": "Fri, 01 Nov 2019 16:29:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1572629252",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf0b2ec3da3061f2b2fcb4a57302a097\"",
-      "Last-Modified": "Wed, 30 Oct 2019 01:54:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D319:5DFB:15D51E2:19DE203:5DBC5D54"
-    }
-  },
-  "uuid": "25876edf-6351-4b59-9e1d-82886a02f721",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..b63d57e198
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "25876edf-6351-4b59-9e1d-82886a02f721",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 01 Nov 2019 16:29:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1572629252",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf0b2ec3da3061f2b2fcb4a57302a097\"",
+      "Last-Modified": "Wed, 30 Oct 2019 01:54:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D319:5DFB:15D51E2:19DE203:5DBC5D54"
+    }
+  },
+  "uuid": "25876edf-6351-4b59-9e1d-82886a02f721",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5-97bad2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5-97bad2.json
deleted file mode 100644
index 67f3a8f87a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5-97bad2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "97bad23b-9d25-4db2-8420-afbc40b450ac",
-  "name": "teams_3501817_repos",
-  "request": {
-    "url": "/teams/3501817/repos",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3501817_repos-97bad23b-9d25-4db2-8420-afbc40b450ac.json",
-    "headers": {
-      "Date": "Fri, 01 Nov 2019 16:29:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1572629252",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"99c69bfffe7e8b07f2a131b6a51ab377\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D319:5DFB:15D5245:19DE265:5DBC5D55"
-    }
-  },
-  "uuid": "97bad23b-9d25-4db2-8420-afbc40b450ac",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5.json
new file mode 100644
index 0000000000..24024ce538
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/teams_3501817_repos-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "97bad23b-9d25-4db2-8420-afbc40b450ac",
+  "name": "teams_3501817_repos",
+  "request": {
+    "url": "/teams/3501817/repos",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3501817_repos-5.json",
+    "headers": {
+      "Date": "Fri, 01 Nov 2019 16:29:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1572629252",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"99c69bfffe7e8b07f2a131b6a51ab377\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D319:5DFB:15D5245:19DE265:5DBC5D55"
+    }
+  },
+  "uuid": "97bad23b-9d25-4db2-8420-afbc40b450ac",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1-8620f0.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1-8620f0.json
deleted file mode 100644
index 3e8a4dbca2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1-8620f0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8620f09e-7f34-4e00-860b-335d22d56f92",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8620f09e-7f34-4e00-860b-335d22d56f92.json",
-    "headers": {
-      "Date": "Fri, 01 Nov 2019 16:29:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "1572629252",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"314a780ab48b55be9920f26d1eda7d83\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D319:5DFB:15D513B:19DE13D:5DBC5D53"
-    }
-  },
-  "uuid": "8620f09e-7f34-4e00-860b-335d22d56f92",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1.json
new file mode 100644
index 0000000000..a0d44249bf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateTeamWithRepoAccess/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8620f09e-7f34-4e00-860b-335d22d56f92",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 01 Nov 2019 16:29:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "1572629252",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"314a780ab48b55be9920f26d1eda7d83\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D319:5DFB:15D513B:19DE13D:5DBC5D53"
+    }
+  },
+  "uuid": "8620f09e-7f34-4e00-860b-335d22d56f92",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org-6480b3f7-e3e1-4a01-98fb-ca85b6ea4099.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org-6480b3f7-e3e1-4a01-98fb-ca85b6ea4099.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_members-e0db340d-7d23-488e-9858-6e71ed5a4c84.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_members-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_members-e0db340d-7d23-488e-9858-6e71ed5a4c84.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_members-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_memberships_martinvanzijl2-d8831e1a-2b63-4d3f-82b2-87f4d14116f3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_memberships_martinvanzijl2-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_memberships_martinvanzijl2-d8831e1a-2b63-4d3f-82b2-87f4d14116f3.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/orgs_github-api-test-org_memberships_martinvanzijl2-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/user-7e6e7d53-a5ae-46b0-afc0-a73258da075d.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/user-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/user-7e6e7d53-a5ae-46b0-afc0-a73258da075d.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/user-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/users_martinvanzijl2-26b89bbe-835e-4bf6-b60a-bc32177b3fdb.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/users_martinvanzijl2-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/users_martinvanzijl2-26b89bbe-835e-4bf6-b60a-bc32177b3fdb.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/__files/users_martinvanzijl2-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1-6480b3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1-6480b3.json
deleted file mode 100644
index c159022fc6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1-6480b3.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "6480b3f7-e3e1-4a01-98fb-ca85b6ea4099",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-6480b3f7-e3e1-4a01-98fb-ca85b6ea4099.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 01:45:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1570415536",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d8bc4d5d05a58bb455672c502a2bd068\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED29:68EB:382F4B:417BC3:5D9A98A2"
-    }
-  },
-  "uuid": "6480b3f7-e3e1-4a01-98fb-ca85b6ea4099",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1.json
new file mode 100644
index 0000000000..acea9ba2bd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "6480b3f7-e3e1-4a01-98fb-ca85b6ea4099",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 01:45:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4947",
+      "X-RateLimit-Reset": "1570415536",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d8bc4d5d05a58bb455672c502a2bd068\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED29:68EB:382F4B:417BC3:5D9A98A2"
+    }
+  },
+  "uuid": "6480b3f7-e3e1-4a01-98fb-ca85b6ea4099",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2-e0db34.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2-e0db34.json
deleted file mode 100644
index 8f6ad9a2de..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2-e0db34.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "e0db340d-7d23-488e-9858-6e71ed5a4c84",
-  "name": "orgs_github-api-test-org_members",
-  "request": {
-    "url": "/orgs/github-api-test-org/members",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_members-e0db340d-7d23-488e-9858-6e71ed5a4c84.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 01:45:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1570415536",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"28698a13d1d693d64b821be22f3d3455\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED29:68EB:382F58:417BD1:5D9A98A3"
-    }
-  },
-  "uuid": "e0db340d-7d23-488e-9858-6e71ed5a4c84",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2.json
new file mode 100644
index 0000000000..6305b3cc67
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members-2.json
@@ -0,0 +1,45 @@
+{
+  "id": "e0db340d-7d23-488e-9858-6e71ed5a4c84",
+  "name": "orgs_github-api-test-org_members",
+  "request": {
+    "url": "/orgs/github-api-test-org/members",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_members-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 01:45:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1570415536",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"28698a13d1d693d64b821be22f3d3455\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED29:68EB:382F58:417BD1:5D9A98A3"
+    }
+  },
+  "uuid": "e0db340d-7d23-488e-9858-6e71ed5a4c84",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members_martinvanzijl2-4-885640.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members_martinvanzijl2-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members_martinvanzijl2-4-885640.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_members_martinvanzijl2-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5-d8831e.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5-d8831e.json
deleted file mode 100644
index dcb31e129f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5-d8831e.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "d8831e1a-2b63-4d3f-82b2-87f4d14116f3",
-  "name": "orgs_github-api-test-org_memberships_martinvanzijl2",
-  "request": {
-    "url": "/orgs/github-api-test-org/memberships/martinvanzijl2",
-    "method": "PUT",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"role\":\"member\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_memberships_martinvanzijl2-d8831e1a-2b63-4d3f-82b2-87f4d14116f3.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 02:32:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1570418960",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5b0170b5d0a93008c60b76928a17590d\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BBDE:0E84:C4BDE4:E266C5:5D9AA3D6"
-    }
-  },
-  "uuid": "d8831e1a-2b63-4d3f-82b2-87f4d14116f3",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5.json
new file mode 100644
index 0000000000..747806fac6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/orgs_github-api-test-org_memberships_martinvanzijl2-5.json
@@ -0,0 +1,52 @@
+{
+  "id": "d8831e1a-2b63-4d3f-82b2-87f4d14116f3",
+  "name": "orgs_github-api-test-org_memberships_martinvanzijl2",
+  "request": {
+    "url": "/orgs/github-api-test-org/memberships/martinvanzijl2",
+    "method": "PUT",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"role\":\"member\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_memberships_martinvanzijl2-5.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 02:32:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1570418960",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5b0170b5d0a93008c60b76928a17590d\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BBDE:0E84:C4BDE4:E266C5:5D9AA3D6"
+    }
+  },
+  "uuid": "d8831e1a-2b63-4d3f-82b2-87f4d14116f3",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6-7e6e7d.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6-7e6e7d.json
deleted file mode 100644
index 5c7307740f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6-7e6e7d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7e6e7d53-a5ae-46b0-afc0-a73258da075d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-7e6e7d53-a5ae-46b0-afc0-a73258da075d.json",
-    "headers": {
-      "Date": "Wed, 20 Nov 2019 01:07:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1574215499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3d6980508567a2e87daa452d20106bcd\"",
-      "Last-Modified": "Tue, 19 Nov 2019 18:23:21 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A230:58D9:963D8A:AF4500:5DD491EB"
-    }
-  },
-  "uuid": "7e6e7d53-a5ae-46b0-afc0-a73258da075d",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6.json
new file mode 100644
index 0000000000..10510e482b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/user-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "7e6e7d53-a5ae-46b0-afc0-a73258da075d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-6.json",
+    "headers": {
+      "Date": "Wed, 20 Nov 2019 01:07:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1574215499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3d6980508567a2e87daa452d20106bcd\"",
+      "Last-Modified": "Tue, 19 Nov 2019 18:23:21 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A230:58D9:963D8A:AF4500:5DD491EB"
+    }
+  },
+  "uuid": "7e6e7d53-a5ae-46b0-afc0-a73258da075d",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3-26b89b.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3-26b89b.json
deleted file mode 100644
index 896ad746a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3-26b89b.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "26b89bbe-835e-4bf6-b60a-bc32177b3fdb",
-  "name": "users_martinvanzijl2",
-  "request": {
-    "url": "/users/martinvanzijl2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_martinvanzijl2-26b89bbe-835e-4bf6-b60a-bc32177b3fdb.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 02:32:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1570418960",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6dca753bbfc1fe8923a2f99bb429a781\"",
-      "Last-Modified": "Mon, 07 Oct 2019 02:24:44 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BBDE:0E84:C4BDCE:E266A9:5D9AA3D5"
-    }
-  },
-  "uuid": "26b89bbe-835e-4bf6-b60a-bc32177b3fdb",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3.json
new file mode 100644
index 0000000000..b069890e9f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testInviteUser/mappings/users_martinvanzijl2-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "26b89bbe-835e-4bf6-b60a-bc32177b3fdb",
+  "name": "users_martinvanzijl2",
+  "request": {
+    "url": "/users/martinvanzijl2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_martinvanzijl2-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 02:32:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1570418960",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6dca753bbfc1fe8923a2f99bb429a781\"",
+      "Last-Modified": "Mon, 07 Oct 2019 02:24:44 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BBDE:0E84:C4BDCE:E266A9:5D9AA3D5"
+    }
+  },
+  "uuid": "26b89bbe-835e-4bf6-b60a-bc32177b3fdb",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org-3ed48345-73c2-4d8e-9c65-f4a140356d59.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org-3ed48345-73c2-4d8e-9c65-f4a140356d59.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org_members-ef9f50f7-160c-4410-a82e-68d3e14fb250.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org_members-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org_members-ef9f50f7-160c-4410-a82e-68d3e14fb250.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/orgs_github-api-test-org_members-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/user-9e0ec7a6-d16f-4198-b2e6-ed290e9d780d.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/user-9e0ec7a6-d16f-4198-b2e6-ed290e9d780d.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2-3ed483.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2-3ed483.json
deleted file mode 100644
index a257d2274e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2-3ed483.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3ed48345-73c2-4d8e-9c65-f4a140356d59",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-3ed48345-73c2-4d8e-9c65-f4a140356d59.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 25 Feb 2020 14:41:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4984",
-      "X-RateLimit-Reset": "1582644474",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"712644daa44df3089a27d6ef60979929\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EB37:2979:3EAF7E:786110:5E5531FF"
-    }
-  },
-  "uuid": "3ed48345-73c2-4d8e-9c65-f4a140356d59",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..c8c6908e70
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "3ed48345-73c2-4d8e-9c65-f4a140356d59",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 25 Feb 2020 14:41:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4984",
+      "X-RateLimit-Reset": "1582644474",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"712644daa44df3089a27d6ef60979929\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EB37:2979:3EAF7E:786110:5E5531FF"
+    }
+  },
+  "uuid": "3ed48345-73c2-4d8e-9c65-f4a140356d59",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3-ef9f50.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3-ef9f50.json
deleted file mode 100644
index 1f03bdc51b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3-ef9f50.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ef9f50f7-160c-4410-a82e-68d3e14fb250",
-  "name": "orgs_github-api-test-org_members",
-  "request": {
-    "url": "/orgs/github-api-test-org/members?filter=all",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_members-ef9f50f7-160c-4410-a82e-68d3e14fb250.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 25 Feb 2020 14:41:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4983",
-      "X-RateLimit-Reset": "1582644475",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"631de12e6bc586863218257765331a70\"",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EB37:2979:3EAF8C:78624D:5E553201"
-    }
-  },
-  "uuid": "ef9f50f7-160c-4410-a82e-68d3e14fb250",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3.json
new file mode 100644
index 0000000000..7b472f8f78
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/orgs_github-api-test-org_members-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "ef9f50f7-160c-4410-a82e-68d3e14fb250",
+  "name": "orgs_github-api-test-org_members",
+  "request": {
+    "url": "/orgs/github-api-test-org/members?filter=all",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_members-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 25 Feb 2020 14:41:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4983",
+      "X-RateLimit-Reset": "1582644475",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"631de12e6bc586863218257765331a70\"",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EB37:2979:3EAF8C:78624D:5E553201"
+    }
+  },
+  "uuid": "ef9f50f7-160c-4410-a82e-68d3e14fb250",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1-9e0ec7.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1-9e0ec7.json
deleted file mode 100644
index dfc3db833b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1-9e0ec7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9e0ec7a6-d16f-4198-b2e6-ed290e9d780d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9e0ec7a6-d16f-4198-b2e6-ed290e9d780d.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 25 Feb 2020 14:41:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4988",
-      "X-RateLimit-Reset": "1582644474",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9adfa44fe91fb698b5fd807d9471afc3\"",
-      "Last-Modified": "Tue, 18 Feb 2020 13:29:56 GMT",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EB37:2979:3EAEEA:7860F9:5E5531FF"
-    }
-  },
-  "uuid": "9e0ec7a6-d16f-4198-b2e6-ed290e9d780d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1.json
new file mode 100644
index 0000000000..95af69065a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithFilter/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "9e0ec7a6-d16f-4198-b2e6-ed290e9d780d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 25 Feb 2020 14:41:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1582644474",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9adfa44fe91fb698b5fd807d9471afc3\"",
+      "Last-Modified": "Tue, 18 Feb 2020 13:29:56 GMT",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EB37:2979:3EAEEA:7860F9:5E5531FF"
+    }
+  },
+  "uuid": "9e0ec7a6-d16f-4198-b2e6-ed290e9d780d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org-6682f58b-c93b-4525-9e99-485e631aaaab.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org-6682f58b-c93b-4525-9e99-485e631aaaab.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org_members-80be661d-6679-43df-9ced-eb3b78827280.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org_members-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org_members-80be661d-6679-43df-9ced-eb3b78827280.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/orgs_github-api-test-org_members-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/user-a3604d73-d76d-4f3e-8f7f-cecee94c5cef.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/user-a3604d73-d76d-4f3e-8f7f-cecee94c5cef.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2-6682f5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2-6682f5.json
deleted file mode 100644
index a43e01d143..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2-6682f5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6682f58b-c93b-4525-9e99-485e631aaaab",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-6682f58b-c93b-4525-9e99-485e631aaaab.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 25 Feb 2020 14:29:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1582644474",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"712644daa44df3089a27d6ef60979929\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E7D4:4A52:336FA3:797A80:5E552F38"
-    }
-  },
-  "uuid": "6682f58b-c93b-4525-9e99-485e631aaaab",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..51f1d6d902
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "6682f58b-c93b-4525-9e99-485e631aaaab",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 25 Feb 2020 14:29:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1582644474",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"712644daa44df3089a27d6ef60979929\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E7D4:4A52:336FA3:797A80:5E552F38"
+    }
+  },
+  "uuid": "6682f58b-c93b-4525-9e99-485e631aaaab",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3-80be66.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3-80be66.json
deleted file mode 100644
index e08ca0e3e9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3-80be66.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "80be661d-6679-43df-9ced-eb3b78827280",
-  "name": "orgs_github-api-test-org_members",
-  "request": {
-    "url": "/orgs/github-api-test-org/members?role=admin",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_members-80be661d-6679-43df-9ced-eb3b78827280.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 25 Feb 2020 14:29:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1582644474",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"631de12e6bc586863218257765331a70\"",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E7D4:4A52:336FBD:797AB0:5E552F38"
-    }
-  },
-  "uuid": "80be661d-6679-43df-9ced-eb3b78827280",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3.json
new file mode 100644
index 0000000000..7aa9abb189
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/orgs_github-api-test-org_members-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "80be661d-6679-43df-9ced-eb3b78827280",
+  "name": "orgs_github-api-test-org_members",
+  "request": {
+    "url": "/orgs/github-api-test-org/members?role=admin",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_members-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 25 Feb 2020 14:29:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1582644474",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"631de12e6bc586863218257765331a70\"",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E7D4:4A52:336FBD:797AB0:5E552F38"
+    }
+  },
+  "uuid": "80be661d-6679-43df-9ced-eb3b78827280",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1-a3604d.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1-a3604d.json
deleted file mode 100644
index 11342e3d51..0000000000
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1-a3604d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a3604d73-d76d-4f3e-8f7f-cecee94c5cef",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a3604d73-d76d-4f3e-8f7f-cecee94c5cef.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 25 Feb 2020 14:27:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4999",
-      "X-RateLimit-Reset": "1582644474",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9adfa44fe91fb698b5fd807d9471afc3\"",
-      "Last-Modified": "Tue, 18 Feb 2020 13:29:56 GMT",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E686:35E3:5882BF:ABE338:5E552EEA"
-    }
-  },
-  "uuid": "a3604d73-d76d-4f3e-8f7f-cecee94c5cef",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1.json
new file mode 100644
index 0000000000..092b5256f7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testListMembersWithRole/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a3604d73-d76d-4f3e-8f7f-cecee94c5cef",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 25 Feb 2020 14:27:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4999",
+      "X-RateLimit-Reset": "1582644474",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9adfa44fe91fb698b5fd807d9471afc3\"",
+      "Last-Modified": "Tue, 18 Feb 2020 13:29:56 GMT",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E686:35E3:5882BF:ABE338:5E552EEA"
+    }
+  },
+  "uuid": "a3604d73-d76d-4f3e-8f7f-cecee94c5cef",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/orgs_github-api-test-org-13f85dbd-5b52-49ce-b65b-bac7d3069c78.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/orgs_github-api-test-org-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/orgs_github-api-test-org-13f85dbd-5b52-49ce-b65b-bac7d3069c78.json
rename to src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/orgs_github-api-test-org-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/repos_github-api-test-org_github-api-b3a3dea9-68c7-40d4-8f70-3dddff42e983.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/repos_github-api-test-org_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/repos_github-api-test-org_github-api-b3a3dea9-68c7-40d4-8f70-3dddff42e983.json
rename to src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/repos_github-api-test-org_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/users_github-api-test-org-9edc4a69-96e0-4db6-8469-85483d9ef2c5.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/users_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/users_github-api-test-org-9edc4a69-96e0-4db6-8469-85483d9ef2c5.json
rename to src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/__files/users_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1-13f85d.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1-13f85d.json
deleted file mode 100644
index 31b1e21899..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1-13f85d.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "13f85dbd-5b52-49ce-b65b-bac7d3069c78",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-13f85dbd-5b52-49ce-b65b-bac7d3069c78.json",
-    "headers": {
-      "Date": "Fri, 13 Dec 2019 18:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4995",
-      "X-RateLimit-Reset": "1576264896",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"30cb8c7d1f87f6928d9c05fbc522398f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5F1:7711:F051A3:112CE43:5DF3D720"
-    }
-  },
-  "uuid": "13f85dbd-5b52-49ce-b65b-bac7d3069c78",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1.json
new file mode 100644
index 0000000000..998a53267c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/orgs_github-api-test-org-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "13f85dbd-5b52-49ce-b65b-bac7d3069c78",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-1.json",
+    "headers": {
+      "Date": "Fri, 13 Dec 2019 18:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4995",
+      "X-RateLimit-Reset": "1576264896",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"30cb8c7d1f87f6928d9c05fbc522398f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5F1:7711:F051A3:112CE43:5DF3D720"
+    }
+  },
+  "uuid": "13f85dbd-5b52-49ce-b65b-bac7d3069c78",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2-b3a3de.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2-b3a3de.json
deleted file mode 100644
index 085bf0aeaf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2-b3a3de.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "b3a3dea9-68c7-40d4-8f70-3dddff42e983",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-b3a3dea9-68c7-40d4-8f70-3dddff42e983.json",
-    "headers": {
-      "Date": "Fri, 13 Dec 2019 18:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1576264896",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3bab3de79c7a97496a9a2ee8ae63fc60\"",
-      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5F1:7711:F051B2:112CE47:5DF3D721"
-    }
-  },
-  "uuid": "b3a3dea9-68c7-40d4-8f70-3dddff42e983",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2.json
new file mode 100644
index 0000000000..0954310c17
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/repos_github-api-test-org_github-api-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "b3a3dea9-68c7-40d4-8f70-3dddff42e983",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 13 Dec 2019 18:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1576264896",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3bab3de79c7a97496a9a2ee8ae63fc60\"",
+      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5F1:7711:F051B2:112CE47:5DF3D721"
+    }
+  },
+  "uuid": "b3a3dea9-68c7-40d4-8f70-3dddff42e983",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3-9edc4a.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3-9edc4a.json
deleted file mode 100644
index 6c31ed0f93..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3-9edc4a.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "9edc4a69-96e0-4db6-8469-85483d9ef2c5",
-  "name": "users_github-api-test-org",
-  "request": {
-    "url": "/users/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_github-api-test-org-9edc4a69-96e0-4db6-8469-85483d9ef2c5.json",
-    "headers": {
-      "Date": "Fri, 13 Dec 2019 18:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4993",
-      "X-RateLimit-Reset": "1576264896",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5b2acfd788622a6e0078da036013a0eb\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5F1:7711:F051B7:112CE55:5DF3D722"
-    }
-  },
-  "uuid": "9edc4a69-96e0-4db6-8469-85483d9ef2c5",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3.json
new file mode 100644
index 0000000000..0ad2998619
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForOrganization/mappings/users_github-api-test-org-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "9edc4a69-96e0-4db6-8469-85483d9ef2c5",
+  "name": "users_github-api-test-org",
+  "request": {
+    "url": "/users/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_github-api-test-org-3.json",
+    "headers": {
+      "Date": "Fri, 13 Dec 2019 18:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4993",
+      "X-RateLimit-Reset": "1576264896",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5b2acfd788622a6e0078da036013a0eb\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5F1:7711:F051B7:112CE55:5DF3D722"
+    }
+  },
+  "uuid": "9edc4a69-96e0-4db6-8469-85483d9ef2c5",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/__files/users_kohsuke2-be47bccc-9404-4fe4-be81-ae86857a3c99.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/__files/users_kohsuke2-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/__files/users_kohsuke2-be47bccc-9404-4fe4-be81-ae86857a3c99.json
rename to src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/__files/users_kohsuke2-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1-be47bc.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1-be47bc.json
deleted file mode 100644
index 6f6e288195..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1-be47bc.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "be47bccc-9404-4fe4-be81-ae86857a3c99",
-  "name": "users_kohsuke2",
-  "request": {
-    "url": "/users/kohsuke2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke2-be47bccc-9404-4fe4-be81-ae86857a3c99.json",
-    "headers": {
-      "Date": "Fri, 13 Dec 2019 18:23:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1576264896",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d7eece591c3ac8f84be4eede2c45cddf\"",
-      "Last-Modified": "Thu, 16 May 2019 20:59:50 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5F3:771A:2C88B78:32D2E33:5DF3D723"
-    }
-  },
-  "uuid": "be47bccc-9404-4fe4-be81-ae86857a3c99",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1.json b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1.json
new file mode 100644
index 0000000000..3161fc56ef
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPersonTest/wiremock/testFieldsForUser/mappings/users_kohsuke2-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "be47bccc-9404-4fe4-be81-ae86857a3c99",
+  "name": "users_kohsuke2",
+  "request": {
+    "url": "/users/kohsuke2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke2-1.json",
+    "headers": {
+      "Date": "Fri, 13 Dec 2019 18:23:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1576264896",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d7eece591c3ac8f84be4eede2c45cddf\"",
+      "Last-Modified": "Thu, 16 May 2019 20:59:50 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5F3:771A:2C88B78:32D2E33:5DF3D723"
+    }
+  },
+  "uuid": "be47bccc-9404-4fe4-be81-ae86857a3c99",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org-8a33ed8f-a98f-47af-a4e7-a30928da2e70.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org-8a33ed8f-a98f-47af-a4e7-a30928da2e70.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org_projects-b659e68a-af69-4413-a2fa-602524428990.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org_projects-b659e68a-af69-4413-a2fa-602524428990.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_3312444_columns-3be146c4-9f97-4b2d-9951-16dd86ec334f.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_3312444_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_3312444_columns-3be146c4-9f97-4b2d-9951-16dd86ec334f.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_3312444_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_6706801_cards-45bdd9f0-5efe-43c3-b01f-130894549d0d.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_6706801_cards-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_6706801_cards-45bdd9f0-5efe-43c3-b01f-130894549d0d.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_6706801_cards-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-97fd6c7d-30b2-4036-9d02-b3be29a2c045.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-97fd6c7d-30b2-4036-9d02-b3be29a2c045.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/projects_columns_cards_27353270-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/user-0c7200e4-cdc5-45a5-997a-d7b8568751cf.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/user-0c7200e4-cdc5-45a5-997a-d7b8568751cf.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2-8a33ed.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2-8a33ed.json
deleted file mode 100644
index a48ec2d3d0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2-8a33ed.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8a33ed8f-a98f-47af-a4e7-a30928da2e70",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-8a33ed8f-a98f-47af-a4e7-a30928da2e70.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4631",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937E69:B04FBA:5D97806E"
-    }
-  },
-  "uuid": "8a33ed8f-a98f-47af-a4e7-a30928da2e70",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..74a6fbbe7b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "8a33ed8f-a98f-47af-a4e7-a30928da2e70",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4631",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937E69:B04FBA:5D97806E"
+    }
+  },
+  "uuid": "8a33ed8f-a98f-47af-a4e7-a30928da2e70",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3-b659e6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3-b659e6.json
deleted file mode 100644
index e943abe4f7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3-b659e6.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "b659e68a-af69-4413-a2fa-602524428990",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-b659e68a-af69-4413-a2fa-602524428990.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4630",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"0352b24f63b26aa9d39c6249d1fe1c9d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312444",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937E80:B04FDD:5D97806E"
-    }
-  },
-  "uuid": "b659e68a-af69-4413-a2fa-602524428990",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..4a857f3083
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "b659e68a-af69-4413-a2fa-602524428990",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4630",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"0352b24f63b26aa9d39c6249d1fe1c9d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312444",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937E80:B04FDD:5D97806E"
+    }
+  },
+  "uuid": "b659e68a-af69-4413-a2fa-602524428990",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4-3be146.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4-3be146.json
deleted file mode 100644
index eeb15552f7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4-3be146.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "3be146c4-9f97-4b2d-9951-16dd86ec334f",
-  "name": "projects_3312444_columns",
-  "request": {
-    "url": "/projects/3312444/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312444_columns-3be146c4-9f97-4b2d-9951-16dd86ec334f.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4629",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"8a5a130f59bb6cf0ede0418db5a2ca39\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706801",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937E9D:B05000:5D97806E"
-    }
-  },
-  "uuid": "3be146c4-9f97-4b2d-9951-16dd86ec334f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4.json
new file mode 100644
index 0000000000..517d40d164
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_3312444_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "3be146c4-9f97-4b2d-9951-16dd86ec334f",
+  "name": "projects_3312444_columns",
+  "request": {
+    "url": "/projects/3312444/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312444_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4629",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"8a5a130f59bb6cf0ede0418db5a2ca39\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706801",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937E9D:B05000:5D97806E"
+    }
+  },
+  "uuid": "3be146c4-9f97-4b2d-9951-16dd86ec334f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5-45bdd9.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5-45bdd9.json
deleted file mode 100644
index 535f2dcc82..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5-45bdd9.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "45bdd9f0-5efe-43c3-b01f-130894549d0d",
-  "name": "projects_columns_6706801_cards",
-  "request": {
-    "url": "/projects/columns/6706801/cards",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"This is a card\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_columns_6706801_cards-45bdd9f0-5efe-43c3-b01f-130894549d0d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4628",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"d2c60751e9be05289aec1483ae32d09f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/cards/27353270",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937F08:B0507E:5D978070"
-    }
-  },
-  "uuid": "45bdd9f0-5efe-43c3-b01f-130894549d0d",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5.json
new file mode 100644
index 0000000000..30b4b1d3ce
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_6706801_cards-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "45bdd9f0-5efe-43c3-b01f-130894549d0d",
+  "name": "projects_columns_6706801_cards",
+  "request": {
+    "url": "/projects/columns/6706801/cards",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"This is a card\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_columns_6706801_cards-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4628",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d2c60751e9be05289aec1483ae32d09f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/cards/27353270",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937F08:B0507E:5D978070"
+    }
+  },
+  "uuid": "45bdd9f0-5efe-43c3-b01f-130894549d0d",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6-97fd6c.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6-97fd6c.json
deleted file mode 100644
index 80adae1132..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6-97fd6c.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "97fd6c7d-30b2-4036-9d02-b3be29a2c045",
-  "name": "projects_columns_cards_27353270",
-  "request": {
-    "url": "/projects/columns/cards/27353270",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"archived\":true}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_columns_cards_27353270-97fd6c7d-30b2-4036-9d02-b3be29a2c045.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4627",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ffc5b693f27764f98ac96f98a71de68b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937F1A:B05094:5D978070"
-    }
-  },
-  "uuid": "97fd6c7d-30b2-4036-9d02-b3be29a2c045",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6.json
new file mode 100644
index 0000000000..efd6133234
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-6.json
@@ -0,0 +1,54 @@
+{
+  "id": "97fd6c7d-30b2-4036-9d02-b3be29a2c045",
+  "name": "projects_columns_cards_27353270",
+  "request": {
+    "url": "/projects/columns/cards/27353270",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"archived\":true}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_columns_cards_27353270-6.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4627",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ffc5b693f27764f98ac96f98a71de68b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937F1A:B05094:5D978070"
+    }
+  },
+  "uuid": "97fd6c7d-30b2-4036-9d02-b3be29a2c045",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7-75b0d2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7-75b0d2.json
deleted file mode 100644
index 1fedaebdba..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7-75b0d2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac",
-  "name": "projects_columns_cards_27353270",
-  "request": {
-    "url": "/projects/columns/cards/27353270",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_columns_cards_27353270-75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4626",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ffc5b693f27764f98ac96f98a71de68b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "read:org, repo",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937F27:B050A1:5D978071"
-    }
-  },
-  "uuid": "75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7.json
new file mode 100644
index 0000000000..36280da3f2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/projects_columns_cards_27353270-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac",
+  "name": "projects_columns_cards_27353270",
+  "request": {
+    "url": "/projects/columns/cards/27353270",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_columns_cards_27353270-7.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4626",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ffc5b693f27764f98ac96f98a71de68b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:org, repo",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937F27:B050A1:5D978071"
+    }
+  },
+  "uuid": "75b0d2d0-bf80-4ffe-bb43-a39a48abf2ac",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1-0c7200.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1-0c7200.json
deleted file mode 100644
index 2c559b8356..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1-0c7200.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0c7200e4-cdc5-45a5-997a-d7b8568751cf",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-0c7200e4-cdc5-45a5-997a-d7b8568751cf.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4633",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED3:9576:937E51:B04FAD:5D97806D"
-    }
-  },
-  "uuid": "0c7200e4-cdc5-45a5-997a-d7b8568751cf",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1.json
new file mode 100644
index 0000000000..04aa31ab1d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testArchiveCard/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "0c7200e4-cdc5-45a5-997a-d7b8568751cf",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4633",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED3:9576:937E51:B04FAD:5D97806D"
+    }
+  },
+  "uuid": "0c7200e4-cdc5-45a5-997a-d7b8568751cf",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org-2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org-2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_projects-bac54b7b-af26-4015-85d1-97d981800e06.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_projects-bac54b7b-af26-4015-85d1-97d981800e06.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_repos-c2d81922-c3f6-41b3-b109-de8cfe1452a6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_repos-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_repos-c2d81922-c3f6-41b3-b109-de8cfe1452a6.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_github-api-test-org_repos-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_3312449_columns-5b504083-4657-4d27-aaff-54f97a361d7a.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_3312449_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_3312449_columns-5b504083-4657-4d27-aaff-54f97a361d7a.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_3312449_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-e6d34d34-6779-4c36-83e1-b783989750c3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-e6d34d34-6779-4c36-83e1-b783989750c3.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-6458c399-0897-43a0-a869-f43a56e32cae.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-6458c399-0897-43a0-a869-f43a56e32cae.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_columns_6706803_cards-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/repos_github-api-test-org_repo-for-project-card_issues-29d82e53-34b8-4443-bddd-fdd14726484d.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/repos_github-api-test-org_repo-for-project-card_issues-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/repos_github-api-test-org_repo-for-project-card_issues-29d82e53-34b8-4443-bddd-fdd14726484d.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/repos_github-api-test-org_repo-for-project-card_issues-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/user-b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/user-b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2-2cd475.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2-2cd475.json
deleted file mode 100644
index fecaa968e4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2-2cd475.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4605",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:142032B:183BE8A:5D978076"
-    }
-  },
-  "uuid": "2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..3e9ec2a29d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4605",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:142032B:183BE8A:5D978076"
+    }
+  },
+  "uuid": "2cd47524-8e16-4b6b-aedd-d8dbfbfe5aa9",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3-bac54b.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3-bac54b.json
deleted file mode 100644
index 6e4ba3bce2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3-bac54b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "bac54b7b-af26-4015-85d1-97d981800e06",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-bac54b7b-af26-4015-85d1-97d981800e06.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4604",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"d1d461a75278bbbb1a08d18225aed84e\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312449",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:1420357:183BEDA:5D978076"
-    }
-  },
-  "uuid": "bac54b7b-af26-4015-85d1-97d981800e06",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..e627d563d4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "bac54b7b-af26-4015-85d1-97d981800e06",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4604",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d1d461a75278bbbb1a08d18225aed84e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312449",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:1420357:183BEDA:5D978076"
+    }
+  },
+  "uuid": "bac54b7b-af26-4015-85d1-97d981800e06",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6-c2d819.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6-c2d819.json
deleted file mode 100644
index 4ee4c7290e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6-c2d819.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "c2d81922-c3f6-41b3-b109-de8cfe1452a6",
-  "name": "orgs_github-api-test-org_repos",
-  "request": {
-    "url": "/orgs/github-api-test-org/repos",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"repo-for-project-card\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_repos-c2d81922-c3f6-41b3-b109-de8cfe1452a6.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4601",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"ff15f221184e2f39f88faf88098794e9\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/repo-for-project-card",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:14203DE:183BF9A:5D978078"
-    }
-  },
-  "uuid": "c2d81922-c3f6-41b3-b109-de8cfe1452a6",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6.json
new file mode 100644
index 0000000000..1027f09f7d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/orgs_github-api-test-org_repos-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "c2d81922-c3f6-41b3-b109-de8cfe1452a6",
+  "name": "orgs_github-api-test-org_repos",
+  "request": {
+    "url": "/orgs/github-api-test-org/repos",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"repo-for-project-card\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_repos-6.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4601",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"ff15f221184e2f39f88faf88098794e9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/repo-for-project-card",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:14203DE:183BF9A:5D978078"
+    }
+  },
+  "uuid": "c2d81922-c3f6-41b3-b109-de8cfe1452a6",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4-5b5040.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4-5b5040.json
deleted file mode 100644
index 11dc478d8d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4-5b5040.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "5b504083-4657-4d27-aaff-54f97a361d7a",
-  "name": "projects_3312449_columns",
-  "request": {
-    "url": "/projects/3312449/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312449_columns-5b504083-4657-4d27-aaff-54f97a361d7a.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4603",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"6d8f989a5dec185be871918f7ec4d50c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706803",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:142037F:183BF13:5D978077"
-    }
-  },
-  "uuid": "5b504083-4657-4d27-aaff-54f97a361d7a",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4.json
new file mode 100644
index 0000000000..c41b4759db
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_3312449_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "5b504083-4657-4d27-aaff-54f97a361d7a",
+  "name": "projects_3312449_columns",
+  "request": {
+    "url": "/projects/3312449/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312449_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4603",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"6d8f989a5dec185be871918f7ec4d50c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706803",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:142037F:183BF13:5D978077"
+    }
+  },
+  "uuid": "5b504083-4657-4d27-aaff-54f97a361d7a",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5-e6d34d.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5-e6d34d.json
deleted file mode 100644
index 3d153fdbaa..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5-e6d34d.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "e6d34d34-6779-4c36-83e1-b783989750c3",
-  "name": "projects_columns_6706803_cards",
-  "request": {
-    "url": "/projects/columns/6706803/cards",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"This is a card\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_columns_6706803_cards-e6d34d34-6779-4c36-83e1-b783989750c3.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4602",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"0d7f40e0e039f508cb3b99df2bde0ed3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/cards/27353274",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:142039F:183BF3D:5D978077"
-    }
-  },
-  "uuid": "e6d34d34-6779-4c36-83e1-b783989750c3",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5.json
new file mode 100644
index 0000000000..4d59a4c33b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "e6d34d34-6779-4c36-83e1-b783989750c3",
+  "name": "projects_columns_6706803_cards",
+  "request": {
+    "url": "/projects/columns/6706803/cards",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"This is a card\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_columns_6706803_cards-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4602",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"0d7f40e0e039f508cb3b99df2bde0ed3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/cards/27353274",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:142039F:183BF3D:5D978077"
+    }
+  },
+  "uuid": "e6d34d34-6779-4c36-83e1-b783989750c3",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8-6458c3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8-6458c3.json
deleted file mode 100644
index 920f6d28fa..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8-6458c3.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "6458c399-0897-43a0-a869-f43a56e32cae",
-  "name": "projects_columns_6706803_cards",
-  "request": {
-    "url": "/projects/columns/6706803/cards",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"content_type\":\"Issue\",\"content_id\":502754474}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_columns_6706803_cards-6458c399-0897-43a0-a869-f43a56e32cae.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4599",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"05e36deeaf8f3f5a1cf0deac806488b7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/cards/27353276",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:142046E:183C033:5D978079"
-    }
-  },
-  "uuid": "6458c399-0897-43a0-a869-f43a56e32cae",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8.json
new file mode 100644
index 0000000000..11a72e060e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/projects_columns_6706803_cards-8.json
@@ -0,0 +1,55 @@
+{
+  "id": "6458c399-0897-43a0-a869-f43a56e32cae",
+  "name": "projects_columns_6706803_cards",
+  "request": {
+    "url": "/projects/columns/6706803/cards",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"content_type\":\"Issue\",\"content_id\":502754474}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_columns_6706803_cards-8.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4599",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"05e36deeaf8f3f5a1cf0deac806488b7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/cards/27353276",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:142046E:183C033:5D978079"
+    }
+  },
+  "uuid": "6458c399-0897-43a0-a869-f43a56e32cae",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card-9-372cc0.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card-9-372cc0.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7-29d82e.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7-29d82e.json
deleted file mode 100644
index c002899e83..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7-29d82e.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "29d82e53-34b8-4443-bddd-fdd14726484d",
-  "name": "repos_github-api-test-org_repo-for-project-card_issues",
-  "request": {
-    "url": "/repos/github-api-test-org/repo-for-project-card/issues",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"assignees\":[],\"title\":\"new-issue\",\"body\":\"With body\",\"labels\":[]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_repo-for-project-card_issues-29d82e53-34b8-4443-bddd-fdd14726484d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4600",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"0d7123758265ea6286208deab2079438\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/repo-for-project-card/issues/1",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:1420438:183BFF5:5D978079"
-    }
-  },
-  "uuid": "29d82e53-34b8-4443-bddd-fdd14726484d",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7.json
new file mode 100644
index 0000000000..6665ea6e81
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/repos_github-api-test-org_repo-for-project-card_issues-7.json
@@ -0,0 +1,55 @@
+{
+  "id": "29d82e53-34b8-4443-bddd-fdd14726484d",
+  "name": "repos_github-api-test-org_repo-for-project-card_issues",
+  "request": {
+    "url": "/repos/github-api-test-org/repo-for-project-card/issues",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"assignees\":[],\"title\":\"new-issue\",\"body\":\"With body\",\"labels\":[]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_repo-for-project-card_issues-7.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4600",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"0d7123758265ea6286208deab2079438\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/repo-for-project-card/issues/1",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:1420438:183BFF5:5D978079"
+    }
+  },
+  "uuid": "29d82e53-34b8-4443-bddd-fdd14726484d",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1-b9c4ba.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1-b9c4ba.json
deleted file mode 100644
index 4ee4235179..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1-b9c4ba.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4607",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEDA:67D5:14202ED:183BE79:5D978076"
-    }
-  },
-  "uuid": "b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1.json
new file mode 100644
index 0000000000..516f530137
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreateCardFromIssue/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4607",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEDA:67D5:14202ED:183BE79:5D978076"
+    }
+  },
+  "uuid": "b9c4ba1f-224e-4e78-85ca-b1ac911fdd4e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org-a73c2760-fcb1-4ad6-a379-508ae8bd6a92.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org-a73c2760-fcb1-4ad6-a379-508ae8bd6a92.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org_projects-fd95c811-2dc4-458b-a18f-72b93e2cfac7.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org_projects-fd95c811-2dc4-458b-a18f-72b93e2cfac7.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_3312442_columns-264f75eb-2b63-4727-9470-21079137ecf4.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_3312442_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_3312442_columns-264f75eb-2b63-4727-9470-21079137ecf4.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_3312442_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_columns_6706799_cards-0a15ceb0-700f-41b0-8a07-ac04dcdcd13f.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_columns_6706799_cards-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_columns_6706799_cards-0a15ceb0-700f-41b0-8a07-ac04dcdcd13f.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/projects_columns_6706799_cards-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/user-80e34816-e0ac-422b-807b-bc8c1f2bd313.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/user-80e34816-e0ac-422b-807b-bc8c1f2bd313.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2-a73c27.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2-a73c27.json
deleted file mode 100644
index 7f92eb3bbe..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2-a73c27.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a73c2760-fcb1-4ad6-a379-508ae8bd6a92",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-a73c2760-fcb1-4ad6-a379-508ae8bd6a92.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4657",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECA:67D5:141FD27:183B741:5D978066"
-    }
-  },
-  "uuid": "a73c2760-fcb1-4ad6-a379-508ae8bd6a92",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..6b81ffde6f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "a73c2760-fcb1-4ad6-a379-508ae8bd6a92",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4657",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECA:67D5:141FD27:183B741:5D978066"
+    }
+  },
+  "uuid": "a73c2760-fcb1-4ad6-a379-508ae8bd6a92",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3-fd95c8.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3-fd95c8.json
deleted file mode 100644
index 757a258822..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3-fd95c8.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "fd95c811-2dc4-458b-a18f-72b93e2cfac7",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-fd95c811-2dc4-458b-a18f-72b93e2cfac7.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4656",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"8483e57ecc662f52cb6cd664af324822\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312442",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECA:67D5:141FD33:183B786:5D978067"
-    }
-  },
-  "uuid": "fd95c811-2dc4-458b-a18f-72b93e2cfac7",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..d372db29f4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "fd95c811-2dc4-458b-a18f-72b93e2cfac7",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4656",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"8483e57ecc662f52cb6cd664af324822\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312442",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECA:67D5:141FD33:183B786:5D978067"
+    }
+  },
+  "uuid": "fd95c811-2dc4-458b-a18f-72b93e2cfac7",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4-264f75.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4-264f75.json
deleted file mode 100644
index 9ff4ed58de..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4-264f75.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "264f75eb-2b63-4727-9470-21079137ecf4",
-  "name": "projects_3312442_columns",
-  "request": {
-    "url": "/projects/3312442/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312442_columns-264f75eb-2b63-4727-9470-21079137ecf4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4655",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"1f426f1160a962a9db803541783fa38f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706799",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECA:67D5:141FD56:183B7AF:5D978067"
-    }
-  },
-  "uuid": "264f75eb-2b63-4727-9470-21079137ecf4",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4.json
new file mode 100644
index 0000000000..677bd3bf7c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_3312442_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "264f75eb-2b63-4727-9470-21079137ecf4",
+  "name": "projects_3312442_columns",
+  "request": {
+    "url": "/projects/3312442/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312442_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4655",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"1f426f1160a962a9db803541783fa38f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706799",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECA:67D5:141FD56:183B7AF:5D978067"
+    }
+  },
+  "uuid": "264f75eb-2b63-4727-9470-21079137ecf4",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5-0a15ce.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5-0a15ce.json
deleted file mode 100644
index 8a53b6549e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5-0a15ce.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "0a15ceb0-700f-41b0-8a07-ac04dcdcd13f",
-  "name": "projects_columns_6706799_cards",
-  "request": {
-    "url": "/projects/columns/6706799/cards",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"This is a card\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_columns_6706799_cards-0a15ceb0-700f-41b0-8a07-ac04dcdcd13f.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4654",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"29deaf737002d2e2c98e6667fd9c03a6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/cards/27353264",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECA:67D5:141FD76:183B7D1:5D978068"
-    }
-  },
-  "uuid": "0a15ceb0-700f-41b0-8a07-ac04dcdcd13f",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5.json
new file mode 100644
index 0000000000..e2980e7d5e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/projects_columns_6706799_cards-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "0a15ceb0-700f-41b0-8a07-ac04dcdcd13f",
+  "name": "projects_columns_6706799_cards",
+  "request": {
+    "url": "/projects/columns/6706799/cards",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"This is a card\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_columns_6706799_cards-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4654",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"29deaf737002d2e2c98e6667fd9c03a6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/cards/27353264",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECA:67D5:141FD76:183B7D1:5D978068"
+    }
+  },
+  "uuid": "0a15ceb0-700f-41b0-8a07-ac04dcdcd13f",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1-80e348.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1-80e348.json
deleted file mode 100644
index ac7bfb8218..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1-80e348.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "80e34816-e0ac-422b-807b-bc8c1f2bd313",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-80e34816-e0ac-422b-807b-bc8c1f2bd313.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4659",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECA:67D5:141FCEE:183B730:5D978066"
-    }
-  },
-  "uuid": "80e34816-e0ac-422b-807b-bc8c1f2bd313",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1.json
new file mode 100644
index 0000000000..6bfcb29f2b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testCreatedCard/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "80e34816-e0ac-422b-807b-bc8c1f2bd313",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4659",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECA:67D5:141FCEE:183B730:5D978066"
+    }
+  },
+  "uuid": "80e34816-e0ac-422b-807b-bc8c1f2bd313",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org-467a3990-86b4-4c0f-9d2a-e51630e548f6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org-467a3990-86b4-4c0f-9d2a-e51630e548f6.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org_projects-491fbbf4-d8d0-433d-9ec6-162fa95ad792.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org_projects-491fbbf4-d8d0-433d-9ec6-162fa95ad792.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_3312447_columns-f80b3261-cf13-4bcf-82b7-19a1425cbe78.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_3312447_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_3312447_columns-f80b3261-cf13-4bcf-82b7-19a1425cbe78.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_3312447_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_columns_6706802_cards-aad1d69e-1823-41cc-9cb0-fac06faa77c3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_columns_6706802_cards-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_columns_6706802_cards-aad1d69e-1823-41cc-9cb0-fac06faa77c3.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/projects_columns_6706802_cards-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/user-c2f32bbc-aa66-407b-a3e3-4533d04dd4b0.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/user-c2f32bbc-aa66-407b-a3e3-4533d04dd4b0.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2-467a39.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2-467a39.json
deleted file mode 100644
index 177036153a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2-467a39.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "467a3990-86b4-4c0f-9d2a-e51630e548f6",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-467a3990-86b4-4c0f-9d2a-e51630e548f6.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4617",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED7:6B2E:1EAC0FC:24478BC:5D978072"
-    }
-  },
-  "uuid": "467a3990-86b4-4c0f-9d2a-e51630e548f6",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..4c181ee733
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "467a3990-86b4-4c0f-9d2a-e51630e548f6",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4617",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED7:6B2E:1EAC0FC:24478BC:5D978072"
+    }
+  },
+  "uuid": "467a3990-86b4-4c0f-9d2a-e51630e548f6",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3-491fbb.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3-491fbb.json
deleted file mode 100644
index ba1f088e12..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3-491fbb.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "491fbbf4-d8d0-433d-9ec6-162fa95ad792",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-491fbbf4-d8d0-433d-9ec6-162fa95ad792.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4616",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"eb4cbb2bed76b2e9609e23e1b2eec231\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312447",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED7:6B2E:1EAC115:2447957:5D978073"
-    }
-  },
-  "uuid": "491fbbf4-d8d0-433d-9ec6-162fa95ad792",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..ef27a610a1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "491fbbf4-d8d0-433d-9ec6-162fa95ad792",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4616",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"eb4cbb2bed76b2e9609e23e1b2eec231\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312447",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED7:6B2E:1EAC115:2447957:5D978073"
+    }
+  },
+  "uuid": "491fbbf4-d8d0-433d-9ec6-162fa95ad792",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4-f80b32.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4-f80b32.json
deleted file mode 100644
index 078ce85ca8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4-f80b32.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "f80b3261-cf13-4bcf-82b7-19a1425cbe78",
-  "name": "projects_3312447_columns",
-  "request": {
-    "url": "/projects/3312447/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312447_columns-f80b3261-cf13-4bcf-82b7-19a1425cbe78.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4615",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"926a8e0ba7900d031f98b6d037504662\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706802",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED7:6B2E:1EAC164:244799C:5D978073"
-    }
-  },
-  "uuid": "f80b3261-cf13-4bcf-82b7-19a1425cbe78",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4.json
new file mode 100644
index 0000000000..f087e97e7f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_3312447_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "f80b3261-cf13-4bcf-82b7-19a1425cbe78",
+  "name": "projects_3312447_columns",
+  "request": {
+    "url": "/projects/3312447/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312447_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4615",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"926a8e0ba7900d031f98b6d037504662\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706802",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED7:6B2E:1EAC164:244799C:5D978073"
+    }
+  },
+  "uuid": "f80b3261-cf13-4bcf-82b7-19a1425cbe78",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5-aad1d6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5-aad1d6.json
deleted file mode 100644
index 53ebb9d0fb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5-aad1d6.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "aad1d69e-1823-41cc-9cb0-fac06faa77c3",
-  "name": "projects_columns_6706802_cards",
-  "request": {
-    "url": "/projects/columns/6706802/cards",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"This is a card\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_columns_6706802_cards-aad1d69e-1823-41cc-9cb0-fac06faa77c3.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4614",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"44c27a1ce11e5684b7e6315c800f2b3d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/cards/27353272",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED7:6B2E:1EAC194:24479DE:5D978074"
-    }
-  },
-  "uuid": "aad1d69e-1823-41cc-9cb0-fac06faa77c3",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5.json
new file mode 100644
index 0000000000..93da04c723
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_6706802_cards-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "aad1d69e-1823-41cc-9cb0-fac06faa77c3",
+  "name": "projects_columns_6706802_cards",
+  "request": {
+    "url": "/projects/columns/6706802/cards",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"This is a card\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_columns_6706802_cards-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4614",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"44c27a1ce11e5684b7e6315c800f2b3d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/cards/27353272",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED7:6B2E:1EAC194:24479DE:5D978074"
+    }
+  },
+  "uuid": "aad1d69e-1823-41cc-9cb0-fac06faa77c3",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-6-e93cbd.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-6-e93cbd.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-7-a7094f.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-7-a7094f.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/projects_columns_cards_27353272-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1-c2f32b.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1-c2f32b.json
deleted file mode 100644
index c3203ef6a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1-c2f32b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c2f32bbc-aa66-407b-a3e3-4533d04dd4b0",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c2f32bbc-aa66-407b-a3e3-4533d04dd4b0.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:25:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4619",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FED7:6B2E:1EAC06D:2447893:5D978072"
-    }
-  },
-  "uuid": "c2f32bbc-aa66-407b-a3e3-4533d04dd4b0",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1.json
new file mode 100644
index 0000000000..2dfdf28d37
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testDeleteCard/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c2f32bbc-aa66-407b-a3e3-4533d04dd4b0",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:25:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4619",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FED7:6B2E:1EAC06D:2447893:5D978072"
+    }
+  },
+  "uuid": "c2f32bbc-aa66-407b-a3e3-4533d04dd4b0",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org-049038eb-8cc8-4480-b0e9-62a6bb55f112.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org-049038eb-8cc8-4480-b0e9-62a6bb55f112.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org_projects-68e871e2-343e-47b7-aa45-b613ef9f8bc0.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org_projects-68e871e2-343e-47b7-aa45-b613ef9f8bc0.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_3312443_columns-1de47f2e-9018-4a4f-9dad-0ee29614aa4e.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_3312443_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_3312443_columns-1de47f2e-9018-4a4f-9dad-0ee29614aa4e.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_3312443_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_6706800_cards-695ce51a-3df9-4aea-b10d-471d3ff856b8.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_6706800_cards-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_6706800_cards-695ce51a-3df9-4aea-b10d-471d3ff856b8.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_6706800_cards-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-93c5d233-0602-432f-a6a1-784506a19fe0.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-93c5d233-0602-432f-a6a1-784506a19fe0.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/projects_columns_cards_27353267-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/user-355d682a-6ab6-4af5-be72-d00bf6403051.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/user-355d682a-6ab6-4af5-be72-d00bf6403051.json
rename to src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2-049038.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2-049038.json
deleted file mode 100644
index b17f858107..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2-049038.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "049038eb-8cc8-4480-b0e9-62a6bb55f112",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-049038eb-8cc8-4480-b0e9-62a6bb55f112.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4645",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937D7E:B04EA7:5D97806A"
-    }
-  },
-  "uuid": "049038eb-8cc8-4480-b0e9-62a6bb55f112",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..1bafe72e83
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "049038eb-8cc8-4480-b0e9-62a6bb55f112",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4645",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937D7E:B04EA7:5D97806A"
+    }
+  },
+  "uuid": "049038eb-8cc8-4480-b0e9-62a6bb55f112",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3-68e871.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3-68e871.json
deleted file mode 100644
index c0dcb9b5ad..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3-68e871.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "68e871e2-343e-47b7-aa45-b613ef9f8bc0",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-68e871e2-343e-47b7-aa45-b613ef9f8bc0.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4644",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"7bb94c8c7bbddb7adf83151d48bd7acc\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312443",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937D87:B04EB8:5D97806A"
-    }
-  },
-  "uuid": "68e871e2-343e-47b7-aa45-b613ef9f8bc0",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..a0f5eac1f6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "68e871e2-343e-47b7-aa45-b613ef9f8bc0",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4644",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"7bb94c8c7bbddb7adf83151d48bd7acc\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312443",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937D87:B04EB8:5D97806A"
+    }
+  },
+  "uuid": "68e871e2-343e-47b7-aa45-b613ef9f8bc0",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4-1de47f.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4-1de47f.json
deleted file mode 100644
index 3cb65f91ae..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4-1de47f.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "1de47f2e-9018-4a4f-9dad-0ee29614aa4e",
-  "name": "projects_3312443_columns",
-  "request": {
-    "url": "/projects/3312443/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312443_columns-1de47f2e-9018-4a4f-9dad-0ee29614aa4e.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4643",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"3243dc01ed1b53aabad6a24f048dc99f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706800",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937D98:B04ECA:5D97806A"
-    }
-  },
-  "uuid": "1de47f2e-9018-4a4f-9dad-0ee29614aa4e",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4.json
new file mode 100644
index 0000000000..c301406f56
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_3312443_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "1de47f2e-9018-4a4f-9dad-0ee29614aa4e",
+  "name": "projects_3312443_columns",
+  "request": {
+    "url": "/projects/3312443/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312443_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4643",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"3243dc01ed1b53aabad6a24f048dc99f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706800",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937D98:B04ECA:5D97806A"
+    }
+  },
+  "uuid": "1de47f2e-9018-4a4f-9dad-0ee29614aa4e",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5-695ce5.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5-695ce5.json
deleted file mode 100644
index 9d031abca5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5-695ce5.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "695ce51a-3df9-4aea-b10d-471d3ff856b8",
-  "name": "projects_columns_6706800_cards",
-  "request": {
-    "url": "/projects/columns/6706800/cards",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"This is a card\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_columns_6706800_cards-695ce51a-3df9-4aea-b10d-471d3ff856b8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4642",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"11ba043406f49747c9a9276315707b66\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/cards/27353267",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937DA3:B04EDA:5D97806B"
-    }
-  },
-  "uuid": "695ce51a-3df9-4aea-b10d-471d3ff856b8",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5.json
new file mode 100644
index 0000000000..474e775d37
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_6706800_cards-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "695ce51a-3df9-4aea-b10d-471d3ff856b8",
+  "name": "projects_columns_6706800_cards",
+  "request": {
+    "url": "/projects/columns/6706800/cards",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"This is a card\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_columns_6706800_cards-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4642",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"11ba043406f49747c9a9276315707b66\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/cards/27353267",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937DA3:B04EDA:5D97806B"
+    }
+  },
+  "uuid": "695ce51a-3df9-4aea-b10d-471d3ff856b8",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6-62a0d7.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6-62a0d7.json
deleted file mode 100644
index 59ae1476bf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6-62a0d7.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f",
-  "name": "projects_columns_cards_27353267",
-  "request": {
-    "url": "/projects/columns/cards/27353267",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"New note\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_columns_cards_27353267-62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4641",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c7463959f008c276bc758a6de34254ef\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937DB6:B04EF0:5D97806B"
-    }
-  },
-  "uuid": "62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6.json
new file mode 100644
index 0000000000..5074f19cdf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-6.json
@@ -0,0 +1,54 @@
+{
+  "id": "62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f",
+  "name": "projects_columns_cards_27353267",
+  "request": {
+    "url": "/projects/columns/cards/27353267",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"New note\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_columns_cards_27353267-6.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4641",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c7463959f008c276bc758a6de34254ef\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937DB6:B04EF0:5D97806B"
+    }
+  },
+  "uuid": "62a0d7cf-0c8a-4f96-8c00-c48aeaab4a6f",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7-93c5d2.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7-93c5d2.json
deleted file mode 100644
index 8ac0de83d6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7-93c5d2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "93c5d233-0602-432f-a6a1-784506a19fe0",
-  "name": "projects_columns_cards_27353267",
-  "request": {
-    "url": "/projects/columns/cards/27353267",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_columns_cards_27353267-93c5d233-0602-432f-a6a1-784506a19fe0.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4640",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c7463959f008c276bc758a6de34254ef\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "read:org, repo",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937DC4:B04F01:5D97806B"
-    }
-  },
-  "uuid": "93c5d233-0602-432f-a6a1-784506a19fe0",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7.json
new file mode 100644
index 0000000000..8fbe30a002
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/projects_columns_cards_27353267-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "93c5d233-0602-432f-a6a1-784506a19fe0",
+  "name": "projects_columns_cards_27353267",
+  "request": {
+    "url": "/projects/columns/cards/27353267",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_columns_cards_27353267-7.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4640",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c7463959f008c276bc758a6de34254ef\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:org, repo",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937DC4:B04F01:5D97806B"
+    }
+  },
+  "uuid": "93c5d233-0602-432f-a6a1-784506a19fe0",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1-355d68.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1-355d68.json
deleted file mode 100644
index ae3036f677..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1-355d68.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "355d682a-6ab6-4af5-be72-d00bf6403051",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-355d682a-6ab6-4af5-be72-d00bf6403051.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4647",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FECE:9576:937D70:B04E9E:5D978069"
-    }
-  },
-  "uuid": "355d682a-6ab6-4af5-be72-d00bf6403051",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1.json
new file mode 100644
index 0000000000..f32fe0ece7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectCardTest/wiremock/testEditCardNote/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "355d682a-6ab6-4af5-be72-d00bf6403051",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4647",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FECE:9576:937D70:B04E9E:5D978069"
+    }
+  },
+  "uuid": "355d682a-6ab6-4af5-be72-d00bf6403051",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org-7feb4202-bd04-498e-a28c-fd9df44d8fc8.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org-7feb4202-bd04-498e-a28c-fd9df44d8fc8.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org_projects-42bd7d98-f969-40ce-bb9a-1586c556569d.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org_projects-42bd7d98-f969-40ce-bb9a-1586c556569d.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/projects_3312440_columns-eb58635e-11b9-461d-8868-6ece3733f962.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/projects_3312440_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/projects_3312440_columns-eb58635e-11b9-461d-8868-6ece3733f962.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/projects_3312440_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/user-ff30f972-21ad-40ee-aa60-c006643154d2.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/user-ff30f972-21ad-40ee-aa60-c006643154d2.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2-7feb42.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2-7feb42.json
deleted file mode 100644
index 5cb50eeeb0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2-7feb42.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7feb4202-bd04-498e-a28c-fd9df44d8fc8",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-7feb4202-bd04-498e-a28c-fd9df44d8fc8.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4675",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBB:3620:19183A8:1E0F91F:5D97804A"
-    }
-  },
-  "uuid": "7feb4202-bd04-498e-a28c-fd9df44d8fc8",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..c5fdf37f3a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7feb4202-bd04-498e-a28c-fd9df44d8fc8",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4675",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBB:3620:19183A8:1E0F91F:5D97804A"
+    }
+  },
+  "uuid": "7feb4202-bd04-498e-a28c-fd9df44d8fc8",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3-42bd7d.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3-42bd7d.json
deleted file mode 100644
index ba9ab37bdb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3-42bd7d.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "42bd7d98-f969-40ce-bb9a-1586c556569d",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-42bd7d98-f969-40ce-bb9a-1586c556569d.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4674",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"a6900939a35440d9033eab3545193374\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312440",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBB:3620:19183C0:1E0F963:5D97804A"
-    }
-  },
-  "uuid": "42bd7d98-f969-40ce-bb9a-1586c556569d",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..555b8f6628
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "42bd7d98-f969-40ce-bb9a-1586c556569d",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4674",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"a6900939a35440d9033eab3545193374\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312440",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBB:3620:19183C0:1E0F963:5D97804A"
+    }
+  },
+  "uuid": "42bd7d98-f969-40ce-bb9a-1586c556569d",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4-eb5863.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4-eb5863.json
deleted file mode 100644
index 0567230cc7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4-eb5863.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "eb58635e-11b9-461d-8868-6ece3733f962",
-  "name": "projects_3312440_columns",
-  "request": {
-    "url": "/projects/3312440/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312440_columns-eb58635e-11b9-461d-8868-6ece3733f962.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4673",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"379f6babba44d5b0f33db74b05e245cc\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706793",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBB:3620:19183EC:1E0F994:5D97804B"
-    }
-  },
-  "uuid": "eb58635e-11b9-461d-8868-6ece3733f962",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4.json
new file mode 100644
index 0000000000..bfc418ae46
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/projects_3312440_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "eb58635e-11b9-461d-8868-6ece3733f962",
+  "name": "projects_3312440_columns",
+  "request": {
+    "url": "/projects/3312440/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312440_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4673",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"379f6babba44d5b0f33db74b05e245cc\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706793",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBB:3620:19183EC:1E0F994:5D97804B"
+    }
+  },
+  "uuid": "eb58635e-11b9-461d-8868-6ece3733f962",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1-ff30f9.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1-ff30f9.json
deleted file mode 100644
index 6ef074bbc2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1-ff30f9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ff30f972-21ad-40ee-aa60-c006643154d2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ff30f972-21ad-40ee-aa60-c006643154d2.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4677",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBB:3620:1918377:1E0F90A:5D97804A"
-    }
-  },
-  "uuid": "ff30f972-21ad-40ee-aa60-c006643154d2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1.json
new file mode 100644
index 0000000000..c12226a583
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testCreatedColumn/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "ff30f972-21ad-40ee-aa60-c006643154d2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4677",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBB:3620:1918377:1E0F90A:5D97804A"
+    }
+  },
+  "uuid": "ff30f972-21ad-40ee-aa60-c006643154d2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org-f4a0595a-a719-4b21-bf67-f12d67bac972.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org-f4a0595a-a719-4b21-bf67-f12d67bac972.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org_projects-bfb7de93-74a1-48dc-a74a-ba06cee9e764.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org_projects-bfb7de93-74a1-48dc-a74a-ba06cee9e764.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/projects_3312441_columns-fb6e53a0-db62-4037-8f0b-3511e79bea93.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/projects_3312441_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/projects_3312441_columns-fb6e53a0-db62-4037-8f0b-3511e79bea93.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/projects_3312441_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/user-f818b667-7eed-4efb-9719-ea27f8d05b59.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/user-f818b667-7eed-4efb-9719-ea27f8d05b59.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2-f4a059.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2-f4a059.json
deleted file mode 100644
index 48e28e6616..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2-f4a059.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f4a0595a-a719-4b21-bf67-f12d67bac972",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-f4a0595a-a719-4b21-bf67-f12d67bac972.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4666",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBE:9576:93789E:B048D3:5D97804C"
-    }
-  },
-  "uuid": "f4a0595a-a719-4b21-bf67-f12d67bac972",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..41db74f1da
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f4a0595a-a719-4b21-bf67-f12d67bac972",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4666",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBE:9576:93789E:B048D3:5D97804C"
+    }
+  },
+  "uuid": "f4a0595a-a719-4b21-bf67-f12d67bac972",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3-bfb7de.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3-bfb7de.json
deleted file mode 100644
index eb93d81cf0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3-bfb7de.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "bfb7de93-74a1-48dc-a74a-ba06cee9e764",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-bfb7de93-74a1-48dc-a74a-ba06cee9e764.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4665",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"692005a3bf5a296797a4882a89ae8d1c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312441",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBE:9576:9378A6:B048E5:5D97804C"
-    }
-  },
-  "uuid": "bfb7de93-74a1-48dc-a74a-ba06cee9e764",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..dc3f8beaad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "bfb7de93-74a1-48dc-a74a-ba06cee9e764",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4665",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"692005a3bf5a296797a4882a89ae8d1c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312441",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBE:9576:9378A6:B048E5:5D97804C"
+    }
+  },
+  "uuid": "bfb7de93-74a1-48dc-a74a-ba06cee9e764",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4-fb6e53.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4-fb6e53.json
deleted file mode 100644
index 5c9a79eba1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4-fb6e53.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "fb6e53a0-db62-4037-8f0b-3511e79bea93",
-  "name": "projects_3312441_columns",
-  "request": {
-    "url": "/projects/3312441/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312441_columns-fb6e53a0-db62-4037-8f0b-3511e79bea93.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4664",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"7675060e89ea2dcb4eb492d8e0c75501\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706794",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBE:9576:9378BA:B048F7:5D97804D"
-    }
-  },
-  "uuid": "fb6e53a0-db62-4037-8f0b-3511e79bea93",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4.json
new file mode 100644
index 0000000000..bdf22b914d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_3312441_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "fb6e53a0-db62-4037-8f0b-3511e79bea93",
+  "name": "projects_3312441_columns",
+  "request": {
+    "url": "/projects/3312441/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312441_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4664",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"7675060e89ea2dcb4eb492d8e0c75501\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706794",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBE:9576:9378BA:B048F7:5D97804D"
+    }
+  },
+  "uuid": "fb6e53a0-db62-4037-8f0b-3511e79bea93",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-5-8c0cae.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-5-8c0cae.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-6-112e1e.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-6-112e1e.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/projects_columns_6706794-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1-f818b6.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1-f818b6.json
deleted file mode 100644
index 864ffd77b5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1-f818b6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f818b667-7eed-4efb-9719-ea27f8d05b59",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f818b667-7eed-4efb-9719-ea27f8d05b59.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4668",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEBE:9576:937891:B048CB:5D97804C"
-    }
-  },
-  "uuid": "f818b667-7eed-4efb-9719-ea27f8d05b59",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1.json
new file mode 100644
index 0000000000..0d4c2af174
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testDeleteColumn/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f818b667-7eed-4efb-9719-ea27f8d05b59",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4668",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEBE:9576:937891:B048CB:5D97804C"
+    }
+  },
+  "uuid": "f818b667-7eed-4efb-9719-ea27f8d05b59",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org-eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org-eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org_projects-97b70b32-45f4-419f-87d0-f15a2c004196.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org_projects-97b70b32-45f4-419f-87d0-f15a2c004196.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_3312439_columns-082ed3d1-bea6-48fc-8e61-a63c4d0db977.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_3312439_columns-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_3312439_columns-082ed3d1-bea6-48fc-8e61-a63c4d0db977.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_3312439_columns-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-85f35660-6579-4bea-af53-b636239dd5cd.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-85f35660-6579-4bea-af53-b636239dd5cd.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/projects_columns_6706791-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/user-e21e45b0-f34c-473e-9454-cb601fb759b9.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/user-e21e45b0-f34c-473e-9454-cb601fb759b9.json
rename to src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2-eb0425.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2-eb0425.json
deleted file mode 100644
index 1f809f881b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2-eb0425.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4686",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CD3A:21106FC:5D978047"
-    }
-  },
-  "uuid": "eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..07f69937c1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4686",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CD3A:21106FC:5D978047"
+    }
+  },
+  "uuid": "eb0425ef-7f2e-4b3a-a7f7-53cef5d5647b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3-97b70b.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3-97b70b.json
deleted file mode 100644
index 3fc8f2fb01..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3-97b70b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "97b70b32-45f4-419f-87d0-f15a2c004196",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-97b70b32-45f4-419f-87d0-f15a2c004196.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4685",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"040d8b7f5c015e1b70de188f5f75a2dd\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312439",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CD54:2110760:5D978047"
-    }
-  },
-  "uuid": "97b70b32-45f4-419f-87d0-f15a2c004196",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..4a9a6dc8df
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "97b70b32-45f4-419f-87d0-f15a2c004196",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4685",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"040d8b7f5c015e1b70de188f5f75a2dd\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312439",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CD54:2110760:5D978047"
+    }
+  },
+  "uuid": "97b70b32-45f4-419f-87d0-f15a2c004196",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4-082ed3.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4-082ed3.json
deleted file mode 100644
index f4d6199161..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4-082ed3.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "082ed3d1-bea6-48fc-8e61-a63c4d0db977",
-  "name": "projects_3312439_columns",
-  "request": {
-    "url": "/projects/3312439/columns",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"column-one\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "projects_3312439_columns-082ed3d1-bea6-48fc-8e61-a63c4d0db977.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4684",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"4a9022ef010ae8a2bbc6ec155fca2f9b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/columns/6706791",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CD9B:211079F:5D978048"
-    }
-  },
-  "uuid": "082ed3d1-bea6-48fc-8e61-a63c4d0db977",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4.json
new file mode 100644
index 0000000000..8efdde76e7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_3312439_columns-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "082ed3d1-bea6-48fc-8e61-a63c4d0db977",
+  "name": "projects_3312439_columns",
+  "request": {
+    "url": "/projects/3312439/columns",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"column-one\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "projects_3312439_columns-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4684",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"4a9022ef010ae8a2bbc6ec155fca2f9b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/columns/6706791",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CD9B:211079F:5D978048"
+    }
+  },
+  "uuid": "082ed3d1-bea6-48fc-8e61-a63c4d0db977",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5-85f356.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5-85f356.json
deleted file mode 100644
index b3b9b1da3e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5-85f356.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "85f35660-6579-4bea-af53-b636239dd5cd",
-  "name": "projects_columns_6706791",
-  "request": {
-    "url": "/projects/columns/6706791",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"new-name\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_columns_6706791-85f35660-6579-4bea-af53-b636239dd5cd.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4683",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"df1e321ce6b9b1cfb88f5947bff72393\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CDD9:21107DA:5D978048"
-    }
-  },
-  "uuid": "85f35660-6579-4bea-af53-b636239dd5cd",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5.json
new file mode 100644
index 0000000000..dbcb31601c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "85f35660-6579-4bea-af53-b636239dd5cd",
+  "name": "projects_columns_6706791",
+  "request": {
+    "url": "/projects/columns/6706791",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"new-name\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_columns_6706791-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4683",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"df1e321ce6b9b1cfb88f5947bff72393\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CDD9:21107DA:5D978048"
+    }
+  },
+  "uuid": "85f35660-6579-4bea-af53-b636239dd5cd",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6-1cfa5d.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6-1cfa5d.json
deleted file mode 100644
index f66bacb849..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6-1cfa5d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17",
-  "name": "projects_columns_6706791",
-  "request": {
-    "url": "/projects/columns/6706791",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_columns_6706791-1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4682",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"df1e321ce6b9b1cfb88f5947bff72393\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "read:org, repo",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CE06:211081E:5D978049"
-    }
-  },
-  "uuid": "1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6.json
new file mode 100644
index 0000000000..67273080b1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/projects_columns_6706791-6.json
@@ -0,0 +1,47 @@
+{
+  "id": "1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17",
+  "name": "projects_columns_6706791",
+  "request": {
+    "url": "/projects/columns/6706791",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_columns_6706791-6.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4682",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"df1e321ce6b9b1cfb88f5947bff72393\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:org, repo",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CE06:211081E:5D978049"
+    }
+  },
+  "uuid": "1cfa5ddf-74f4-4a95-aaf2-c8149c7d1c17",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1-e21e45.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1-e21e45.json
deleted file mode 100644
index ed96086a07..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1-e21e45.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e21e45b0-f34c-473e-9454-cb601fb759b9",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-e21e45b0-f34c-473e-9454-cb601fb759b9.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:24:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4688",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CCEE:21106E7:5D978047"
-    }
-  },
-  "uuid": "e21e45b0-f34c-473e-9454-cb601fb759b9",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1.json
new file mode 100644
index 0000000000..0631b26495
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectColumnTest/wiremock/testEditColumnName/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "e21e45b0-f34c-473e-9454-cb601fb759b9",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:24:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4688",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB6:2CE8:1B9CCEE:21106E7:5D978047"
+    }
+  },
+  "uuid": "e21e45b0-f34c-473e-9454-cb601fb759b9",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org-713f01eb-4f07-4f02-89fe-e7560ed08e11.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org-713f01eb-4f07-4f02-89fe-e7560ed08e11.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org_projects-e5afd90e-d2ac-4e83-800d-a680bc27c9ed.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org_projects-e5afd90e-d2ac-4e83-800d-a680bc27c9ed.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/user-a9a3d26a-4c87-4ebf-9609-48b2120173b7.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/user-a9a3d26a-4c87-4ebf-9609-48b2120173b7.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2-713f01.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2-713f01.json
deleted file mode 100644
index 7ecfb75e6c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2-713f01.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "713f01eb-4f07-4f02-89fe-e7560ed08e11",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-713f01eb-4f07-4f02-89fe-e7560ed08e11.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4722",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE9F:3C98:18F214:1DE2D7:5D978009"
-    }
-  },
-  "uuid": "713f01eb-4f07-4f02-89fe-e7560ed08e11",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..bbb72135f0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "713f01eb-4f07-4f02-89fe-e7560ed08e11",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4722",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE9F:3C98:18F214:1DE2D7:5D978009"
+    }
+  },
+  "uuid": "713f01eb-4f07-4f02-89fe-e7560ed08e11",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3-e5afd9.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3-e5afd9.json
deleted file mode 100644
index 30d42c61f8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3-e5afd9.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "e5afd90e-d2ac-4e83-800d-a680bc27c9ed",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-e5afd90e-d2ac-4e83-800d-a680bc27c9ed.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4721",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"7a699861cb77bfa34b007afda4f83f36\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312432",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE9F:3C98:18F216:1DE2DD:5D97800A"
-    }
-  },
-  "uuid": "e5afd90e-d2ac-4e83-800d-a680bc27c9ed",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..b43d5e0b07
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "e5afd90e-d2ac-4e83-800d-a680bc27c9ed",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4721",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"7a699861cb77bfa34b007afda4f83f36\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312432",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE9F:3C98:18F216:1DE2DD:5D97800A"
+    }
+  },
+  "uuid": "e5afd90e-d2ac-4e83-800d-a680bc27c9ed",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1-a9a3d2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1-a9a3d2.json
deleted file mode 100644
index 51c31b579c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1-a9a3d2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a9a3d26a-4c87-4ebf-9609-48b2120173b7",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a9a3d26a-4c87-4ebf-9609-48b2120173b7.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4724",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE9F:3C98:18F210:1DE2D5:5D978009"
-    }
-  },
-  "uuid": "a9a3d26a-4c87-4ebf-9609-48b2120173b7",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1.json
new file mode 100644
index 0000000000..32208be82c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testCreatedProject/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a9a3d26a-4c87-4ebf-9609-48b2120173b7",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4724",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE9F:3C98:18F210:1DE2D5:5D978009"
+    }
+  },
+  "uuid": "a9a3d26a-4c87-4ebf-9609-48b2120173b7",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org-c3024047-fc8f-443f-a2b4-810324f889b4.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org-c3024047-fc8f-443f-a2b4-810324f889b4.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org_projects-daa6c228-6e0f-4398-a6d2-2d114f986e93.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org_projects-daa6c228-6e0f-4398-a6d2-2d114f986e93.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/user-9cb86722-7ae5-46b2-8598-59567e17ed99.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/user-9cb86722-7ae5-46b2-8598-59567e17ed99.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2-c30240.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2-c30240.json
deleted file mode 100644
index 433c908b4e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2-c30240.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c3024047-fc8f-443f-a2b4-810324f889b4",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-c3024047-fc8f-443f-a2b4-810324f889b4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4692",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAD:2CE8:1B9B385:210E7E0:5D978011"
-    }
-  },
-  "uuid": "c3024047-fc8f-443f-a2b4-810324f889b4",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..c2833cd9a9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "c3024047-fc8f-443f-a2b4-810324f889b4",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4692",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAD:2CE8:1B9B385:210E7E0:5D978011"
+    }
+  },
+  "uuid": "c3024047-fc8f-443f-a2b4-810324f889b4",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3-daa6c2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3-daa6c2.json
deleted file mode 100644
index c0e2e7cb3d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3-daa6c2.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "daa6c228-6e0f-4398-a6d2-2d114f986e93",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-daa6c228-6e0f-4398-a6d2-2d114f986e93.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4691",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"4f5ec06b3157c88d6acf342c8db21aac\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312437",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAD:2CE8:1B9B397:210E837:5D978012"
-    }
-  },
-  "uuid": "daa6c228-6e0f-4398-a6d2-2d114f986e93",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..43a64552be
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "daa6c228-6e0f-4398-a6d2-2d114f986e93",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4691",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"4f5ec06b3157c88d6acf342c8db21aac\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312437",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAD:2CE8:1B9B397:210E837:5D978012"
+    }
+  },
+  "uuid": "daa6c228-6e0f-4398-a6d2-2d114f986e93",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-4-f50762.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-4-f50762.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-5-8b8e6f.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-5-8b8e6f.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/projects_3312437-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1-9cb867.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1-9cb867.json
deleted file mode 100644
index 8259952703..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1-9cb867.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9cb86722-7ae5-46b2-8598-59567e17ed99",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9cb86722-7ae5-46b2-8598-59567e17ed99.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4694",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAD:2CE8:1B9B347:210E7D7:5D978011"
-    }
-  },
-  "uuid": "9cb86722-7ae5-46b2-8598-59567e17ed99",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1.json
new file mode 100644
index 0000000000..a8ce0d53c6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testDeleteProject/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "9cb86722-7ae5-46b2-8598-59567e17ed99",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4694",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAD:2CE8:1B9B347:210E7D7:5D978011"
+    }
+  },
+  "uuid": "9cb86722-7ae5-46b2-8598-59567e17ed99",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org-2e39c772-c889-44d1-bf15-5248ad194202.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org-2e39c772-c889-44d1-bf15-5248ad194202.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org_projects-08231b0e-288f-49fa-aa2b-9456449d2cfd.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org_projects-08231b0e-288f-49fa-aa2b-9456449d2cfd.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-004d3495-63b2-40e7-a864-10d175a59756.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-004d3495-63b2-40e7-a864-10d175a59756.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-76e0c251-b1df-4f18-8a01-77a7bbc15474.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-76e0c251-b1df-4f18-8a01-77a7bbc15474.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/projects_3312435-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/user-b2b1262a-1678-4080-af72-92346bb25688.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/user-b2b1262a-1678-4080-af72-92346bb25688.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2-2e39c7.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2-2e39c7.json
deleted file mode 100644
index 239ca1b747..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2-2e39c7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2e39c772-c889-44d1-bf15-5248ad194202",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-2e39c772-c889-44d1-bf15-5248ad194202.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4708",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA7:361A:4A1417:584BFC:5D97800D"
-    }
-  },
-  "uuid": "2e39c772-c889-44d1-bf15-5248ad194202",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..74e872ac85
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "2e39c772-c889-44d1-bf15-5248ad194202",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4708",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA7:361A:4A1417:584BFC:5D97800D"
+    }
+  },
+  "uuid": "2e39c772-c889-44d1-bf15-5248ad194202",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3-08231b.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3-08231b.json
deleted file mode 100644
index 1b132d819f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3-08231b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "08231b0e-288f-49fa-aa2b-9456449d2cfd",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-08231b0e-288f-49fa-aa2b-9456449d2cfd.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4707",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"cefe753176c197026b78819a457c18a0\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312435",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA7:361A:4A1420:584C06:5D97800E"
-    }
-  },
-  "uuid": "08231b0e-288f-49fa-aa2b-9456449d2cfd",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..e59b0ff321
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "08231b0e-288f-49fa-aa2b-9456449d2cfd",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4707",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"cefe753176c197026b78819a457c18a0\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312435",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA7:361A:4A1420:584C06:5D97800E"
+    }
+  },
+  "uuid": "08231b0e-288f-49fa-aa2b-9456449d2cfd",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4-004d34.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4-004d34.json
deleted file mode 100644
index fa01ef1e2f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4-004d34.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "004d3495-63b2-40e7-a864-10d175a59756",
-  "name": "projects_3312435",
-  "request": {
-    "url": "/projects/3312435",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"body\":\"New body\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_3312435-004d3495-63b2-40e7-a864-10d175a59756.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4706",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"69232fc55193c550101d07bd6b082586\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA7:361A:4A1426:584C0F:5D97800E"
-    }
-  },
-  "uuid": "004d3495-63b2-40e7-a864-10d175a59756",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4.json
new file mode 100644
index 0000000000..cd22ef87e4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "004d3495-63b2-40e7-a864-10d175a59756",
+  "name": "projects_3312435",
+  "request": {
+    "url": "/projects/3312435",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"body\":\"New body\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_3312435-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4706",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"69232fc55193c550101d07bd6b082586\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA7:361A:4A1426:584C0F:5D97800E"
+    }
+  },
+  "uuid": "004d3495-63b2-40e7-a864-10d175a59756",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5-76e0c2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5-76e0c2.json
deleted file mode 100644
index 26c16dd9a9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5-76e0c2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "76e0c251-b1df-4f18-8a01-77a7bbc15474",
-  "name": "projects_3312435",
-  "request": {
-    "url": "/projects/3312435",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_3312435-76e0c251-b1df-4f18-8a01-77a7bbc15474.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4705",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"69232fc55193c550101d07bd6b082586\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "read:org, repo",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA7:361A:4A142A:584C14:5D97800F"
-    }
-  },
-  "uuid": "76e0c251-b1df-4f18-8a01-77a7bbc15474",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5.json
new file mode 100644
index 0000000000..6421bd8cf2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/projects_3312435-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "76e0c251-b1df-4f18-8a01-77a7bbc15474",
+  "name": "projects_3312435",
+  "request": {
+    "url": "/projects/3312435",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_3312435-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4705",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"69232fc55193c550101d07bd6b082586\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:org, repo",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA7:361A:4A142A:584C14:5D97800F"
+    }
+  },
+  "uuid": "76e0c251-b1df-4f18-8a01-77a7bbc15474",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1-b2b126.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1-b2b126.json
deleted file mode 100644
index b0d1c1d145..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1-b2b126.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b2b1262a-1678-4080-af72-92346bb25688",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b2b1262a-1678-4080-af72-92346bb25688.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4710",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA7:361A:4A1410:584BF6:5D97800D"
-    }
-  },
-  "uuid": "b2b1262a-1678-4080-af72-92346bb25688",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1.json
new file mode 100644
index 0000000000..25a43b402c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectBody/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b2b1262a-1678-4080-af72-92346bb25688",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4710",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA7:361A:4A1410:584BF6:5D97800D"
+    }
+  },
+  "uuid": "b2b1262a-1678-4080-af72-92346bb25688",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org-e3d87fca-b817-4dfb-b80f-99eebaabba08.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org-e3d87fca-b817-4dfb-b80f-99eebaabba08.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org_projects-6a0a4669-8d74-4fa9-92c0-0fa428078637.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org_projects-6a0a4669-8d74-4fa9-92c0-0fa428078637.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-20ac7f07-9e2b-47dd-801c-67974592a3b9.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-20ac7f07-9e2b-47dd-801c-67974592a3b9.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-6c28d544-7193-4c9d-93a8-5c4bd20af717.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-6c28d544-7193-4c9d-93a8-5c4bd20af717.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/projects_3312436-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/user-115e6194-ffb3-4129-8f7b-ad60f5fff91a.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/user-115e6194-ffb3-4129-8f7b-ad60f5fff91a.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2-e3d87f.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2-e3d87f.json
deleted file mode 100644
index dbcb071c69..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2-e3d87f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e3d87fca-b817-4dfb-b80f-99eebaabba08",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-e3d87fca-b817-4dfb-b80f-99eebaabba08.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4700",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B0D:18C5092:5D978010"
-    }
-  },
-  "uuid": "e3d87fca-b817-4dfb-b80f-99eebaabba08",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..c00baba1df
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "e3d87fca-b817-4dfb-b80f-99eebaabba08",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4700",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B0D:18C5092:5D978010"
+    }
+  },
+  "uuid": "e3d87fca-b817-4dfb-b80f-99eebaabba08",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3-6a0a46.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3-6a0a46.json
deleted file mode 100644
index 49047db182..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3-6a0a46.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "6a0a4669-8d74-4fa9-92c0-0fa428078637",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-6a0a4669-8d74-4fa9-92c0-0fa428078637.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4699",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"ae3e206fe50efc5382388a0f1243289c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312436",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B1E:18C50B1:5D978010"
-    }
-  },
-  "uuid": "6a0a4669-8d74-4fa9-92c0-0fa428078637",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..852c16bb89
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "6a0a4669-8d74-4fa9-92c0-0fa428078637",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4699",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"ae3e206fe50efc5382388a0f1243289c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312436",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B1E:18C50B1:5D978010"
+    }
+  },
+  "uuid": "6a0a4669-8d74-4fa9-92c0-0fa428078637",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4-20ac7f.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4-20ac7f.json
deleted file mode 100644
index 4b1943bf9e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4-20ac7f.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "20ac7f07-9e2b-47dd-801c-67974592a3b9",
-  "name": "projects_3312436",
-  "request": {
-    "url": "/projects/3312436",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"new-name\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_3312436-20ac7f07-9e2b-47dd-801c-67974592a3b9.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4698",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4bae2d84036567575958f036df372cf7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B39:18C50D0:5D978010"
-    }
-  },
-  "uuid": "20ac7f07-9e2b-47dd-801c-67974592a3b9",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4.json
new file mode 100644
index 0000000000..1ef170af7c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "20ac7f07-9e2b-47dd-801c-67974592a3b9",
+  "name": "projects_3312436",
+  "request": {
+    "url": "/projects/3312436",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"new-name\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_3312436-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4698",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4bae2d84036567575958f036df372cf7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B39:18C50D0:5D978010"
+    }
+  },
+  "uuid": "20ac7f07-9e2b-47dd-801c-67974592a3b9",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5-6c28d5.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5-6c28d5.json
deleted file mode 100644
index 0768eabe2d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5-6c28d5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "6c28d544-7193-4c9d-93a8-5c4bd20af717",
-  "name": "projects_3312436",
-  "request": {
-    "url": "/projects/3312436",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_3312436-6c28d544-7193-4c9d-93a8-5c4bd20af717.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4697",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4bae2d84036567575958f036df372cf7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "read:org, repo",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B58:18C50EB:5D978010"
-    }
-  },
-  "uuid": "6c28d544-7193-4c9d-93a8-5c4bd20af717",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5.json
new file mode 100644
index 0000000000..02dd3953bf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/projects_3312436-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "6c28d544-7193-4c9d-93a8-5c4bd20af717",
+  "name": "projects_3312436",
+  "request": {
+    "url": "/projects/3312436",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_3312436-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4697",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4bae2d84036567575958f036df372cf7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:org, repo",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAA:3C9F:14C0B58:18C50EB:5D978010"
+    }
+  },
+  "uuid": "6c28d544-7193-4c9d-93a8-5c4bd20af717",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1-115e61.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1-115e61.json
deleted file mode 100644
index 5470b06c88..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1-115e61.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "115e6194-ffb3-4129-8f7b-ad60f5fff91a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-115e6194-ffb3-4129-8f7b-ad60f5fff91a.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4702",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAA:3C9F:14C0AFE:18C5088:5D97800F"
-    }
-  },
-  "uuid": "115e6194-ffb3-4129-8f7b-ad60f5fff91a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1.json
new file mode 100644
index 0000000000..bfb837117f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectName/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "115e6194-ffb3-4129-8f7b-ad60f5fff91a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4702",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAA:3C9F:14C0AFE:18C5088:5D97800F"
+    }
+  },
+  "uuid": "115e6194-ffb3-4129-8f7b-ad60f5fff91a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org-a522b55e-f089-4a29-a55e-33f0744eca1a.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org-a522b55e-f089-4a29-a55e-33f0744eca1a.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org_projects-ee429eb6-b010-4916-91af-3ce0976426dd.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org_projects-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org_projects-ee429eb6-b010-4916-91af-3ce0976426dd.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/orgs_github-api-test-org_projects-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-55b16b4e-924d-4cf7-9113-fbc644011a44.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-55b16b4e-924d-4cf7-9113-fbc644011a44.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-715884a8-0610-43b5-9379-01ac91168ec0.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-715884a8-0610-43b5-9379-01ac91168ec0.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/projects_3312433-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/user-f7605e5c-c728-4af9-baca-a6e1266d1b4a.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/user-f7605e5c-c728-4af9-baca-a6e1266d1b4a.json
rename to src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2-a522b5.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2-a522b5.json
deleted file mode 100644
index 87f507e564..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2-a522b5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a522b55e-f089-4a29-a55e-33f0744eca1a",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-a522b55e-f089-4a29-a55e-33f0744eca1a.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4716",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA4:67D5:141DFCC:18393EC:5D97800B"
-    }
-  },
-  "uuid": "a522b55e-f089-4a29-a55e-33f0744eca1a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..ed2a3ed3e1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "a522b55e-f089-4a29-a55e-33f0744eca1a",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4716",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f594020395ec69662bd8dc1ceecdc09\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA4:67D5:141DFCC:18393EC:5D97800B"
+    }
+  },
+  "uuid": "a522b55e-f089-4a29-a55e-33f0744eca1a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3-ee429e.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3-ee429e.json
deleted file mode 100644
index 26737288c7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3-ee429e.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "ee429eb6-b010-4916-91af-3ce0976426dd",
-  "name": "orgs_github-api-test-org_projects",
-  "request": {
-    "url": "/orgs/github-api-test-org/projects",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "orgs_github-api-test-org_projects-ee429eb6-b010-4916-91af-3ce0976426dd.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4715",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"4f777a856ead633d72e59b26d48fd596\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "Location": "https://api.github.com/projects/3312433",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA4:67D5:141DFD9:1839402:5D97800C"
-    }
-  },
-  "uuid": "ee429eb6-b010-4916-91af-3ce0976426dd",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3.json
new file mode 100644
index 0000000000..ccf37951d1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/orgs_github-api-test-org_projects-3.json
@@ -0,0 +1,55 @@
+{
+  "id": "ee429eb6-b010-4916-91af-3ce0976426dd",
+  "name": "orgs_github-api-test-org_projects",
+  "request": {
+    "url": "/orgs/github-api-test-org/projects",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"test-project\",\"body\":\"This is a test project\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "orgs_github-api-test-org_projects-3.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4715",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"4f777a856ead633d72e59b26d48fd596\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "Location": "https://api.github.com/projects/3312433",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA4:67D5:141DFD9:1839402:5D97800C"
+    }
+  },
+  "uuid": "ee429eb6-b010-4916-91af-3ce0976426dd",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4-55b16b.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4-55b16b.json
deleted file mode 100644
index 2168b76a8e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4-55b16b.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "55b16b4e-924d-4cf7-9113-fbc644011a44",
-  "name": "projects_3312433",
-  "request": {
-    "url": "/projects/3312433",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_3312433-55b16b4e-924d-4cf7-9113-fbc644011a44.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4714",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"96424fba8e165ef2bd2efd7ae572b817\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo, write:org",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA4:67D5:141DFEF:1839415:5D97800C"
-    }
-  },
-  "uuid": "55b16b4e-924d-4cf7-9113-fbc644011a44",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4.json
new file mode 100644
index 0000000000..0f4ffd99e5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "55b16b4e-924d-4cf7-9113-fbc644011a44",
+  "name": "projects_3312433",
+  "request": {
+    "url": "/projects/3312433",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_3312433-4.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4714",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"96424fba8e165ef2bd2efd7ae572b817\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo, write:org",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA4:67D5:141DFEF:1839415:5D97800C"
+    }
+  },
+  "uuid": "55b16b4e-924d-4cf7-9113-fbc644011a44",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5-715884.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5-715884.json
deleted file mode 100644
index f49d80bf84..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5-715884.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "715884a8-0610-43b5-9379-01ac91168ec0",
-  "name": "projects_3312433",
-  "request": {
-    "url": "/projects/3312433",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.inertia-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "projects_3312433-715884a8-0610-43b5-9379-01ac91168ec0.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4713",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"96424fba8e165ef2bd2efd7ae572b817\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "read:org, repo",
-      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA4:67D5:141E00D:183943D:5D97800C"
-    }
-  },
-  "uuid": "715884a8-0610-43b5-9379-01ac91168ec0",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5.json
new file mode 100644
index 0000000000..98a231bb54
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/projects_3312433-5.json
@@ -0,0 +1,47 @@
+{
+  "id": "715884a8-0610-43b5-9379-01ac91168ec0",
+  "name": "projects_3312433",
+  "request": {
+    "url": "/projects/3312433",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.inertia-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "projects_3312433-5.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4713",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"96424fba8e165ef2bd2efd7ae572b817\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:org, repo",
+      "X-GitHub-Media-Type": "github.inertia-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA4:67D5:141E00D:183943D:5D97800C"
+    }
+  },
+  "uuid": "715884a8-0610-43b5-9379-01ac91168ec0",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1-f7605e.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1-f7605e.json
deleted file mode 100644
index a582a0173d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1-f7605e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f7605e5c-c728-4af9-baca-a6e1266d1b4a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f7605e5c-c728-4af9-baca-a6e1266d1b4a.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 17:23:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4718",
-      "X-RateLimit-Reset": "1570212957",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEA4:67D5:141DFBA:18393E1:5D97800B"
-    }
-  },
-  "uuid": "f7605e5c-c728-4af9-baca-a6e1266d1b4a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1.json
new file mode 100644
index 0000000000..bee85201d6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHProjectTest/wiremock/testEditProjectState/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f7605e5c-c728-4af9-baca-a6e1266d1b4a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 17:23:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4718",
+      "X-RateLimit-Reset": "1570212957",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEA4:67D5:141DFBA:18393E1:5D97800B"
+    }
+  },
+  "uuid": "f7605e5c-c728-4af9-baca-a6e1266d1b4a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/orgs_github-api-test-org-24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/orgs_github-api-test-org-24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-b2a37888-a485-466a-90a1-b56337178b1c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-b2a37888-a485-466a-90a1-b56337178b1c.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-0f9ebc51-ad67-49b7-b75c-ee2421880f0a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-0f9ebc51-ad67-49b7-b75c-ee2421880f0a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-1db0407d-2e07-4407-810e-486b374e8f3e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-1db0407d-2e07-4407-810e-486b374e8f3e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-d6b189f8-494a-48df-bb5b-0756c8396db0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-d6b189f8-494a-48df-bb5b-0756c8396db0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls-607242b1-1d80-46f6-90f0-87c455668f63.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls-607242b1-1d80-46f6-90f0-87c455668f63.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-480ea0b0-4d44-4e09-a652-6551a3613019.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-480ea0b0-4d44-4e09-a652-6551a3613019.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-601780dc-d673-40e8-bc22-76005fce61c3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-601780dc-d673-40e8-bc22-76005fce61c3.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-64929638-544b-4052-8139-da249d59952e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-64929638-544b-4052-8139-da249d59952e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/repos_github-api-test-org_github-api_pulls_272-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/user-b08f022a-37f2-4191-bbef-d348f1330beb.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/user-b08f022a-37f2-4191-bbef-d348f1330beb.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2-24dc8a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2-24dc8a.json
deleted file mode 100644
index 76125e8fe1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2-24dc8a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4830",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30D30:F6759F:5D74ACD3"
-    }
-  },
-  "uuid": "24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..1cb2d1dcbe
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4830",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30D30:F6759F:5D74ACD3"
+    }
+  },
+  "uuid": "24dc8a1a-e0fd-48e7-a48f-8fc0fc9bc01f",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10-b2a378.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10-b2a378.json
deleted file mode 100644
index c50ae8bae5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10-b2a378.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "b2a37888-a485-466a-90a1-b56337178b1c",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-b2a37888-a485-466a-90a1-b56337178b1c.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4822",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e4ca02a4a8d0302ddaf9e4331a08a1f2\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30EA3:F67733:5D74ACD6"
-    }
-  },
-  "uuid": "b2a37888-a485-466a-90a1-b56337178b1c",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10.json
new file mode 100644
index 0000000000..67f88d62e1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-10.json
@@ -0,0 +1,50 @@
+{
+  "id": "b2a37888-a485-466a-90a1-b56337178b1c",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4822",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e4ca02a4a8d0302ddaf9e4331a08a1f2\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30EA3:F67733:5D74ACD6"
+    }
+  },
+  "uuid": "b2a37888-a485-466a-90a1-b56337178b1c",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3-0f9ebc.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3-0f9ebc.json
deleted file mode 100644
index a7b29a6154..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3-0f9ebc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "0f9ebc51-ad67-49b7-b75c-ee2421880f0a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-0f9ebc51-ad67-49b7-b75c-ee2421880f0a.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4829",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2ab1210472fa6103689c7235a9f30ebf\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30D76:F675D2:5D74ACD3"
-    }
-  },
-  "uuid": "0f9ebc51-ad67-49b7-b75c-ee2421880f0a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..1cfb98e56f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "0f9ebc51-ad67-49b7-b75c-ee2421880f0a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4829",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2ab1210472fa6103689c7235a9f30ebf\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30D76:F675D2:5D74ACD3"
+    }
+  },
+  "uuid": "0f9ebc51-ad67-49b7-b75c-ee2421880f0a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5-1db040.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5-1db040.json
deleted file mode 100644
index b1abd5a4de..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5-1db040.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1db0407d-2e07-4407-810e-486b374e8f3e",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1db0407d-2e07-4407-810e-486b374e8f3e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4827",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1ed427629429ded9373deae90c0f49b2\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30DDF:F67648:5D74ACD4"
-    }
-  },
-  "uuid": "1db0407d-2e07-4407-810e-486b374e8f3e",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..ab794f1f84
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "1db0407d-2e07-4407-810e-486b374e8f3e",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4827",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1ed427629429ded9373deae90c0f49b2\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30DDF:F67648:5D74ACD4"
+    }
+  },
+  "uuid": "1db0407d-2e07-4407-810e-486b374e8f3e",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8-d6b189.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8-d6b189.json
deleted file mode 100644
index 4b3cd09f4c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8-d6b189.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d6b189f8-494a-48df-bb5b-0756c8396db0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-d6b189f8-494a-48df-bb5b-0756c8396db0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4824",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e4ca02a4a8d0302ddaf9e4331a08a1f2\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30E56:F676DA:5D74ACD6"
-    }
-  },
-  "uuid": "d6b189f8-494a-48df-bb5b-0756c8396db0",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8.json
new file mode 100644
index 0000000000..99f285f1f6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api-8.json
@@ -0,0 +1,51 @@
+{
+  "id": "d6b189f8-494a-48df-bb5b-0756c8396db0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4824",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e4ca02a4a8d0302ddaf9e4331a08a1f2\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30E56:F676DA:5D74ACD6"
+    }
+  },
+  "uuid": "d6b189f8-494a-48df-bb5b-0756c8396db0",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-11-c7f9dd.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-11-c7f9dd.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-607242.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-607242.json
deleted file mode 100644
index 609fc78c55..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-607242.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "607242b1-1d80-46f6-90f0-87c455668f63",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"closePullRequest\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-607242b1-1d80-46f6-90f0-87c455668f63.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4828",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"0b7c2ab68302ad8433736df658b183bf\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/272",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30D90:F67604:5D74ACD4"
-    }
-  },
-  "uuid": "607242b1-1d80-46f6-90f0-87c455668f63",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..a89f2cbf02
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "607242b1-1d80-46f6-90f0-87c455668f63",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"closePullRequest\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4828",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"0b7c2ab68302ad8433736df658b183bf\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/272",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30D90:F67604:5D74ACD4"
+    }
+  },
+  "uuid": "607242b1-1d80-46f6-90f0-87c455668f63",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6-480ea0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6-480ea0.json
deleted file mode 100644
index 6f3ad63cd7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6-480ea0.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "480ea0b0-4d44-4e09-a652-6551a3613019",
-  "name": "repos_github-api-test-org_github-api_pulls_272",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/272",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_272-480ea0b0-4d44-4e09-a652-6551a3613019.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4826",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"27976b693985b9a4d3c571d1e97a1ae1\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:25:08 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30DF9:F6767A:5D74ACD5"
-    }
-  },
-  "uuid": "480ea0b0-4d44-4e09-a652-6551a3613019",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-272",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-272-2",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6.json
new file mode 100644
index 0000000000..f35ab8ced7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "480ea0b0-4d44-4e09-a652-6551a3613019",
+  "name": "repos_github-api-test-org_github-api_pulls_272",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/272",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_272-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4826",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"27976b693985b9a4d3c571d1e97a1ae1\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:25:08 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30DF9:F6767A:5D74ACD5"
+    }
+  },
+  "uuid": "480ea0b0-4d44-4e09-a652-6551a3613019",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-272",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-272-2",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7-601780.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7-601780.json
deleted file mode 100644
index bc29361b45..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7-601780.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "601780dc-d673-40e8-bc22-76005fce61c3",
-  "name": "repos_github-api-test-org_github-api_pulls_272",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/272",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_272-601780dc-d673-40e8-bc22-76005fce61c3.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4825",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"71b64aa1bf63ae8c9284b04fd53751e4\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30E17:F676A0:5D74ACD5"
-    }
-  },
-  "uuid": "601780dc-d673-40e8-bc22-76005fce61c3",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7.json
new file mode 100644
index 0000000000..95d0b386fa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-7.json
@@ -0,0 +1,54 @@
+{
+  "id": "601780dc-d673-40e8-bc22-76005fce61c3",
+  "name": "repos_github-api-test-org_github-api_pulls_272",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/272",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_272-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4825",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"71b64aa1bf63ae8c9284b04fd53751e4\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30E17:F676A0:5D74ACD5"
+    }
+  },
+  "uuid": "601780dc-d673-40e8-bc22-76005fce61c3",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9-649296.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9-649296.json
deleted file mode 100644
index 0067ac5ba9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9-649296.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "64929638-544b-4052-8139-da249d59952e",
-  "name": "repos_github-api-test-org_github-api_pulls_272",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/272",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_272-64929638-544b-4052-8139-da249d59952e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4823",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"04e2616671d60df70266d5d9d385b3b3\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:25:09 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30E6F:F6770A:5D74ACD6"
-    }
-  },
-  "uuid": "64929638-544b-4052-8139-da249d59952e",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-272",
-  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-272-2",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9.json
new file mode 100644
index 0000000000..dd32c961d6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/repos_github-api-test-org_github-api_pulls_272-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "64929638-544b-4052-8139-da249d59952e",
+  "name": "repos_github-api-test-org_github-api_pulls_272",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/272",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_272-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4823",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"04e2616671d60df70266d5d9d385b3b3\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:25:09 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30E6F:F6770A:5D74ACD6"
+    }
+  },
+  "uuid": "64929638-544b-4052-8139-da249d59952e",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-272",
+  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-272-2",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1-b08f02.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1-b08f02.json
deleted file mode 100644
index 5b03e65535..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1-b08f02.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b08f022a-37f2-4191-bbef-d348f1330beb",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b08f022a-37f2-4191-bbef-d348f1330beb.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4831",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FFA3:15CE:D30D1E:F6758F:5D74ACD3"
-    }
-  },
-  "uuid": "b08f022a-37f2-4191-bbef-d348f1330beb",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1.json
new file mode 100644
index 0000000000..edd80d2223
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/closePullRequest/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b08f022a-37f2-4191-bbef-d348f1330beb",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4831",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FFA3:15CE:D30D1E:F6758F:5D74ACD3"
+    }
+  },
+  "uuid": "b08f022a-37f2-4191-bbef-d348f1330beb",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/orgs_github-api-test-org-449cef5e-5c83-4133-b824-a0d152c31d3d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/orgs_github-api-test-org-449cef5e-5c83-4133-b824-a0d152c31d3d.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api-260db58e-2811-405d-b33f-49b598ae4bc5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api-260db58e-2811-405d-b33f-49b598ae4bc5.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-f9c86da0-31ab-4da8-925c-f45241f78cb6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-f9c86da0-31ab-4da8-925c-f45241f78cb6.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-40b2ed6a-5cf1-425a-80cc-72805839ac0e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-40b2ed6a-5cf1-425a-80cc-72805839ac0e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-91de84e3-deb6-40a3-8684-7d9752767396.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-91de84e3-deb6-40a3-8684-7d9752767396.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-b01981ed-7e57-46f9-af4b-8571bd6cedcf.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-b01981ed-7e57-46f9-af4b-8571bd6cedcf.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-ec3d9059-949c-4244-830a-41beea0ddb2b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-ec3d9059-949c-4244-830a-41beea0ddb2b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/repos_github-api-test-org_github-api_pulls_321-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/user-26b175e4-5fd3-40c9-b4f2-f8fd982edf1a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/user-26b175e4-5fd3-40c9-b4f2-f8fd982edf1a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2-449cef.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2-449cef.json
deleted file mode 100644
index 382d065f91..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2-449cef.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "449cef5e-5c83-4133-b824-a0d152c31d3d",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-449cef5e-5c83-4133-b824-a0d152c31d3d.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4864",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C1804:E6A81:5DAE3286"
-    }
-  },
-  "uuid": "449cef5e-5c83-4133-b824-a0d152c31d3d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..9c5a746b45
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "449cef5e-5c83-4133-b824-a0d152c31d3d",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4864",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C1804:E6A81:5DAE3286"
+    }
+  },
+  "uuid": "449cef5e-5c83-4133-b824-a0d152c31d3d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3-260db5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3-260db5.json
deleted file mode 100644
index fa9b6c6770..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3-260db5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "260db58e-2811-405d-b33f-49b598ae4bc5",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-260db58e-2811-405d-b33f-49b598ae4bc5.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4863",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"978ed71e6256aa46034637baeb514992\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C1814:E6B03:5DAE3287"
-    }
-  },
-  "uuid": "260db58e-2811-405d-b33f-49b598ae4bc5",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..22516cf155
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "260db58e-2811-405d-b33f-49b598ae4bc5",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4863",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"978ed71e6256aa46034637baeb514992\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C1814:E6B03:5DAE3287"
+    }
+  },
+  "uuid": "260db58e-2811-405d-b33f-49b598ae4bc5",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-f9c86d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-f9c86d.json
deleted file mode 100644
index 66e97ee28a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-f9c86d.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "f9c86da0-31ab-4da8-925c-f45241f78cb6",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"draft\":true,\"maintainer_can_modify\":false,\"title\":\"createDraftPullRequest\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-f9c86da0-31ab-4da8-925c-f45241f78cb6.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4862",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"063315a89fcde1ad024391ce34c16d0a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/321",
-      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C1837:E6B2A:5DAE3288"
-    }
-  },
-  "uuid": "f9c86da0-31ab-4da8-925c-f45241f78cb6",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..e69ab9b48b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "f9c86da0-31ab-4da8-925c-f45241f78cb6",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"draft\":true,\"maintainer_can_modify\":false,\"title\":\"createDraftPullRequest\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4862",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"063315a89fcde1ad024391ce34c16d0a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/321",
+      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C1837:E6B2A:5DAE3288"
+    }
+  },
+  "uuid": "f9c86da0-31ab-4da8-925c-f45241f78cb6",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7-40b2ed.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7-40b2ed.json
deleted file mode 100644
index 1fb9355618..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7-40b2ed.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "40b2ed6a-5cf1-425a-80cc-72805839ac0e",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open&head=github-api-test-org%3Atest%2Fstable",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-40b2ed6a-5cf1-425a-80cc-72805839ac0e.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4859",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e348c83000b75f1351833d909f7a2782\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C18DC:E6BE7:5DAE3289"
-    }
-  },
-  "uuid": "40b2ed6a-5cf1-425a-80cc-72805839ac0e",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7.json
new file mode 100644
index 0000000000..701c0a0522
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "40b2ed6a-5cf1-425a-80cc-72805839ac0e",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open&head=github-api-test-org%3Atest%2Fstable",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-7.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4859",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e348c83000b75f1351833d909f7a2782\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C18DC:E6BE7:5DAE3289"
+    }
+  },
+  "uuid": "40b2ed6a-5cf1-425a-80cc-72805839ac0e",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5-91de84.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5-91de84.json
deleted file mode 100644
index 5facbb3838..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5-91de84.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "91de84e3-deb6-40a3-8684-7d9752767396",
-  "name": "repos_github-api-test-org_github-api_pulls_321",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/321",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_321-91de84e3-deb6-40a3-8684-7d9752767396.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4861",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"063315a89fcde1ad024391ce34c16d0a\"",
-      "Last-Modified": "Mon, 21 Oct 2019 22:34:48 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C1892:E6B8B:5DAE3288"
-    }
-  },
-  "uuid": "91de84e3-deb6-40a3-8684-7d9752767396",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-321",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-2",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5.json
new file mode 100644
index 0000000000..00ea2dabf4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "91de84e3-deb6-40a3-8684-7d9752767396",
+  "name": "repos_github-api-test-org_github-api_pulls_321",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/321",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_321-5.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4861",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"063315a89fcde1ad024391ce34c16d0a\"",
+      "Last-Modified": "Mon, 21 Oct 2019 22:34:48 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C1892:E6B8B:5DAE3288"
+    }
+  },
+  "uuid": "91de84e3-deb6-40a3-8684-7d9752767396",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-321",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-2",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6-b01981.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6-b01981.json
deleted file mode 100644
index df6d4b7355..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6-b01981.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "b01981ed-7e57-46f9-af4b-8571bd6cedcf",
-  "name": "repos_github-api-test-org_github-api_pulls_321",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/321",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_321-b01981ed-7e57-46f9-af4b-8571bd6cedcf.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4860",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"97bf06d75e0548a5d05619526fbc4a95\"",
-      "Last-Modified": "Mon, 21 Oct 2019 22:34:48 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C18BF:E6BB1:5DAE3289"
-    }
-  },
-  "uuid": "b01981ed-7e57-46f9-af4b-8571bd6cedcf",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-321",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-3",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6.json
new file mode 100644
index 0000000000..3668e8a221
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "b01981ed-7e57-46f9-af4b-8571bd6cedcf",
+  "name": "repos_github-api-test-org_github-api_pulls_321",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/321",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_321-6.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4860",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"97bf06d75e0548a5d05619526fbc4a95\"",
+      "Last-Modified": "Mon, 21 Oct 2019 22:34:48 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C18BF:E6BB1:5DAE3289"
+    }
+  },
+  "uuid": "b01981ed-7e57-46f9-af4b-8571bd6cedcf",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-321",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-3",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8-ec3d90.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8-ec3d90.json
deleted file mode 100644
index 6038fb2809..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8-ec3d90.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ec3d9059-949c-4244-830a-41beea0ddb2b",
-  "name": "repos_github-api-test-org_github-api_pulls_321",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/321",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_321-ec3d9059-949c-4244-830a-41beea0ddb2b.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4858",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aafccc1379665e90dc144ced21f1f80c\"",
-      "Last-Modified": "Mon, 21 Oct 2019 22:34:48 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C18F5:E6C09:5DAE3289"
-    }
-  },
-  "uuid": "ec3d9059-949c-4244-830a-41beea0ddb2b",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-321",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-3",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8.json
new file mode 100644
index 0000000000..87621e3836
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/repos_github-api-test-org_github-api_pulls_321-8.json
@@ -0,0 +1,50 @@
+{
+  "id": "ec3d9059-949c-4244-830a-41beea0ddb2b",
+  "name": "repos_github-api-test-org_github-api_pulls_321",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/321",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_321-8.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4858",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aafccc1379665e90dc144ced21f1f80c\"",
+      "Last-Modified": "Mon, 21 Oct 2019 22:34:48 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.shadow-cat-preview; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C18F5:E6C09:5DAE3289"
+    }
+  },
+  "uuid": "ec3d9059-949c-4244-830a-41beea0ddb2b",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-321",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-321-3",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1-26b175.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1-26b175.json
deleted file mode 100644
index 5b781c8711..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1-26b175.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "26b175e4-5fd3-40c9-b4f2-f8fd982edf1a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-26b175e4-5fd3-40c9-b4f2-f8fd982edf1a.json",
-    "headers": {
-      "Date": "Mon, 21 Oct 2019 22:34:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4869",
-      "X-RateLimit-Reset": "1571700639",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b3ade9da976cfb0745abc8c0c5812c1e\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB3F:7FDF:C1791:E6A6A:5DAE3286"
-    }
-  },
-  "uuid": "26b175e4-5fd3-40c9-b4f2-f8fd982edf1a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1.json
new file mode 100644
index 0000000000..c5966cfc9b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createDraftPullRequest/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "26b175e4-5fd3-40c9-b4f2-f8fd982edf1a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 21 Oct 2019 22:34:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4869",
+      "X-RateLimit-Reset": "1571700639",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b3ade9da976cfb0745abc8c0c5812c1e\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB3F:7FDF:C1791:E6A6A:5DAE3286"
+    }
+  },
+  "uuid": "26b175e4-5fd3-40c9-b4f2-f8fd982edf1a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/orgs_github-api-test-org-b2d80ea5-16e2-42ed-9de1-71ed44de990a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/orgs_github-api-test-org-b2d80ea5-16e2-42ed-9de1-71ed44de990a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-e04f90b8-9e4c-42f6-867c-1d729dcdf83f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-e04f90b8-9e4c-42f6-867c-1d729dcdf83f.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-31587743-aa9c-4bdd-8e99-6d2603914f13.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-31587743-aa9c-4bdd-8e99-6d2603914f13.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-e393556d-0f08-48c2-9ec1-ecebeced216a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-e393556d-0f08-48c2-9ec1-ecebeced216a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-21bacc38-2501-4be1-a5ed-63d59668aecf.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-21bacc38-2501-4be1-a5ed-63d59668aecf.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls_273-66712670-b79b-48e8-8593-01f7564ff169.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls_273-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls_273-66712670-b79b-48e8-8593-01f7564ff169.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/repos_github-api-test-org_github-api_pulls_273-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/user-17990d92-81a4-43e2-b41b-bf3f95f79276.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/user-17990d92-81a4-43e2-b41b-bf3f95f79276.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2-b2d80e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2-b2d80e.json
deleted file mode 100644
index a0f7367ca9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2-b2d80e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b2d80ea5-16e2-42ed-9de1-71ed44de990a",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b2d80ea5-16e2-42ed-9de1-71ed44de990a.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4993",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D72061:FD3203:5D758CC4"
-    }
-  },
-  "uuid": "b2d80ea5-16e2-42ed-9de1-71ed44de990a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..4ac014420e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b2d80ea5-16e2-42ed-9de1-71ed44de990a",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4993",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D72061:FD3203:5D758CC4"
+    }
+  },
+  "uuid": "b2d80ea5-16e2-42ed-9de1-71ed44de990a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3-e04f90.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3-e04f90.json
deleted file mode 100644
index 5c16e5b131..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3-e04f90.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "e04f90b8-9e4c-42f6-867c-1d729dcdf83f",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-e04f90b8-9e4c-42f6-867c-1d729dcdf83f.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"100f22563cf39ef74c77122e808791ec\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:25:40 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D72069:FD321E:5D758CC5"
-    }
-  },
-  "uuid": "e04f90b8-9e4c-42f6-867c-1d729dcdf83f",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..8bb53a85d6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "e04f90b8-9e4c-42f6-867c-1d729dcdf83f",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"100f22563cf39ef74c77122e808791ec\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:25:40 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D72069:FD321E:5D758CC5"
+    }
+  },
+  "uuid": "e04f90b8-9e4c-42f6-867c-1d729dcdf83f",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5-315877.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5-315877.json
deleted file mode 100644
index 7455de14b2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5-315877.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "31587743-aa9c-4bdd-8e99-6d2603914f13",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-31587743-aa9c-4bdd-8e99-6d2603914f13.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"38a6130bf6ecb7d4e7548d5db29a69ab\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:25:40 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D720B0:FD3276:5D758CC6"
-    }
-  },
-  "uuid": "31587743-aa9c-4bdd-8e99-6d2603914f13",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..2599036296
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,50 @@
+{
+  "id": "31587743-aa9c-4bdd-8e99-6d2603914f13",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"38a6130bf6ecb7d4e7548d5db29a69ab\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:25:40 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D720B0:FD3276:5D758CC6"
+    }
+  },
+  "uuid": "31587743-aa9c-4bdd-8e99-6d2603914f13",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-e39355.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-e39355.json
deleted file mode 100644
index d4a484b9da..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4-e39355.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "e393556d-0f08-48c2-9ec1-ecebeced216a",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"createPullRequest\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-e393556d-0f08-48c2-9ec1-ecebeced216a.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"88d30690a6750391197735fa610d29c7\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/273",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D72080:FD3235:5D758CC5"
-    }
-  },
-  "uuid": "e393556d-0f08-48c2-9ec1-ecebeced216a",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..7c1ecd2fcd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "e393556d-0f08-48c2-9ec1-ecebeced216a",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"createPullRequest\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"88d30690a6750391197735fa610d29c7\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/273",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D72080:FD3235:5D758CC5"
+    }
+  },
+  "uuid": "e393556d-0f08-48c2-9ec1-ecebeced216a",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6-21bacc.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6-21bacc.json
deleted file mode 100644
index 61f01c6be6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6-21bacc.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "21bacc38-2501-4be1-a5ed-63d59668aecf",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-21bacc38-2501-4be1-a5ed-63d59668aecf.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4989",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c99ec4a6900516f992fd7ef1ed6bdc3d\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D720C0:FD328A:5D758CC6"
-    }
-  },
-  "uuid": "21bacc38-2501-4be1-a5ed-63d59668aecf",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6.json
new file mode 100644
index 0000000000..0aa9bc2fc7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls-6.json
@@ -0,0 +1,47 @@
+{
+  "id": "21bacc38-2501-4be1-a5ed-63d59668aecf",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4989",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c99ec4a6900516f992fd7ef1ed6bdc3d\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D720C0:FD328A:5D758CC6"
+    }
+  },
+  "uuid": "21bacc38-2501-4be1-a5ed-63d59668aecf",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7-667126.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7-667126.json
deleted file mode 100644
index aef19832ec..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7-667126.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "66712670-b79b-48e8-8593-01f7564ff169",
-  "name": "repos_github-api-test-org_github-api_pulls_273",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/273",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_273-66712670-b79b-48e8-8593-01f7564ff169.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4988",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2305a6d26f2503df8f8e389e3f5e8132\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D720D3:FD329E:5D758CC6"
-    }
-  },
-  "uuid": "66712670-b79b-48e8-8593-01f7564ff169",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7.json
new file mode 100644
index 0000000000..06e8606224
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/repos_github-api-test-org_github-api_pulls_273-7.json
@@ -0,0 +1,54 @@
+{
+  "id": "66712670-b79b-48e8-8593-01f7564ff169",
+  "name": "repos_github-api-test-org_github-api_pulls_273",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/273",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_273-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2305a6d26f2503df8f8e389e3f5e8132\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D720D3:FD329E:5D758CC6"
+    }
+  },
+  "uuid": "66712670-b79b-48e8-8593-01f7564ff169",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1-17990d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1-17990d.json
deleted file mode 100644
index 4dfca2d840..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1-17990d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "17990d92-81a4-43e2-b41b-bf3f95f79276",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-17990d92-81a4-43e2-b41b-bf3f95f79276.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 23:20:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1567988436",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C902:4FAE:D7204A:FD31FB:5D758CC4"
-    }
-  },
-  "uuid": "17990d92-81a4-43e2-b41b-bf3f95f79276",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1.json
new file mode 100644
index 0000000000..999b6d4ff2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequest/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "17990d92-81a4-43e2-b41b-bf3f95f79276",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 23:20:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1567988436",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C902:4FAE:D7204A:FD31FB:5D758CC4"
+    }
+  },
+  "uuid": "17990d92-81a4-43e2-b41b-bf3f95f79276",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/orgs_github-api-test-org-ad4f3477-141d-413d-aae6-d8d877f4359c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/orgs_github-api-test-org-ad4f3477-141d-413d-aae6-d8d877f4359c.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-de7260bc-cad0-4eeb-ab76-129228a40fa4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-de7260bc-cad0-4eeb-ab76-129228a40fa4.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-6e0179a4-9d47-4435-897a-ca80019c4ee1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-6e0179a4-9d47-4435-897a-ca80019c4ee1.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_issues_270_comments-2cd4dd92-58d7-4423-bbe8-babe22bd36ac.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_issues_270_comments-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_issues_270_comments-2cd4dd92-58d7-4423-bbe8-babe22bd36ac.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_issues_270_comments-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-420dc28a-cfc8-4fbc-8cef-7123c0387966.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-420dc28a-cfc8-4fbc-8cef-7123c0387966.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls_270-1a6fbb20-8969-454a-94be-1e24388e7ed4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls_270-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls_270-1a6fbb20-8969-454a-94be-1e24388e7ed4.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/repos_github-api-test-org_github-api_pulls_270-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/user-c4d4d68f-a141-4fad-a2c9-539e3a21fe94.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/user-c4d4d68f-a141-4fad-a2c9-539e3a21fe94.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2-ad4f34.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2-ad4f34.json
deleted file mode 100644
index 3f862c90c3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2-ad4f34.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ad4f3477-141d-413d-aae6-d8d877f4359c",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-ad4f3477-141d-413d-aae6-d8d877f4359c.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4848",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D30877:F67045:5D74ACCB"
-    }
-  },
-  "uuid": "ad4f3477-141d-413d-aae6-d8d877f4359c",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..3970e7787c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "ad4f3477-141d-413d-aae6-d8d877f4359c",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4848",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D30877:F67045:5D74ACCB"
+    }
+  },
+  "uuid": "ad4f3477-141d-413d-aae6-d8d877f4359c",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3-de7260.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3-de7260.json
deleted file mode 100644
index 9025ab54af..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3-de7260.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "de7260bc-cad0-4eeb-ab76-129228a40fa4",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-de7260bc-cad0-4eeb-ab76-129228a40fa4.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4847",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c7444e60baaecbb2c4b3bfb5ec0122de\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D30882:F67052:5D74ACCB"
-    }
-  },
-  "uuid": "de7260bc-cad0-4eeb-ab76-129228a40fa4",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..8f38abbad8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "de7260bc-cad0-4eeb-ab76-129228a40fa4",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4847",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c7444e60baaecbb2c4b3bfb5ec0122de\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D30882:F67052:5D74ACCB"
+    }
+  },
+  "uuid": "de7260bc-cad0-4eeb-ab76-129228a40fa4",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6-6e0179.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6-6e0179.json
deleted file mode 100644
index 32313971f8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6-6e0179.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "6e0179a4-9d47-4435-897a-ca80019c4ee1",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6e0179a4-9d47-4435-897a-ca80019c4ee1.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4844",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"72809813df8fb60cd108f20632d0c629\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D309B7:F67195:5D74ACCD"
-    }
-  },
-  "uuid": "6e0179a4-9d47-4435-897a-ca80019c4ee1",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..d16b59c738
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,50 @@
+{
+  "id": "6e0179a4-9d47-4435-897a-ca80019c4ee1",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4844",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"72809813df8fb60cd108f20632d0c629\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D309B7:F67195:5D74ACCD"
+    }
+  },
+  "uuid": "6e0179a4-9d47-4435-897a-ca80019c4ee1",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5-2cd4dd.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5-2cd4dd.json
deleted file mode 100644
index c4f0196201..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5-2cd4dd.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "2cd4dd92-58d7-4423-bbe8-babe22bd36ac",
-  "name": "repos_github-api-test-org_github-api_issues_270_comments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/270/comments",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"body\":\"Some comment\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_270_comments-2cd4dd92-58d7-4423-bbe8-babe22bd36ac.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4845",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"ef99935785f5188662f592f8999d1b8a\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments/529177612",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D30902:F670E9:5D74ACCC"
-    }
-  },
-  "uuid": "2cd4dd92-58d7-4423-bbe8-babe22bd36ac",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5.json
new file mode 100644
index 0000000000..250307435e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_issues_270_comments-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "2cd4dd92-58d7-4423-bbe8-babe22bd36ac",
+  "name": "repos_github-api-test-org_github-api_issues_270_comments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/270/comments",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"body\":\"Some comment\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_270_comments-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4845",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"ef99935785f5188662f592f8999d1b8a\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/issues/comments/529177612",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D30902:F670E9:5D74ACCC"
+    }
+  },
+  "uuid": "2cd4dd92-58d7-4423-bbe8-babe22bd36ac",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4-4e9dad.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4-4e9dad.json
deleted file mode 100644
index 88459fec95..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4-4e9dad.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"createPullRequestComment\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4846",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"cb9585955cc58789f91fe57ed42a9e6a\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/270",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D30895:F67066:5D74ACCC"
-    }
-  },
-  "uuid": "4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..1042e31610
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"createPullRequestComment\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4846",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"cb9585955cc58789f91fe57ed42a9e6a\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/270",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D30895:F67066:5D74ACCC"
+    }
+  },
+  "uuid": "4e9dadbb-e2ac-410b-9a7e-8731ed5c86cf",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7-420dc2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7-420dc2.json
deleted file mode 100644
index 83299603c1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7-420dc2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "420dc28a-cfc8-4fbc-8cef-7123c0387966",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-420dc28a-cfc8-4fbc-8cef-7123c0387966.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4843",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"02871f6e732cc23dc28a7c5b94f35624\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D309FE:F6720B:5D74ACCE"
-    }
-  },
-  "uuid": "420dc28a-cfc8-4fbc-8cef-7123c0387966",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7.json
new file mode 100644
index 0000000000..4b5c6885b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "420dc28a-cfc8-4fbc-8cef-7123c0387966",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4843",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"02871f6e732cc23dc28a7c5b94f35624\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D309FE:F6720B:5D74ACCE"
+    }
+  },
+  "uuid": "420dc28a-cfc8-4fbc-8cef-7123c0387966",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8-1a6fbb.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8-1a6fbb.json
deleted file mode 100644
index c5f2986c08..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8-1a6fbb.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "1a6fbb20-8969-454a-94be-1e24388e7ed4",
-  "name": "repos_github-api-test-org_github-api_pulls_270",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/270",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_270-1a6fbb20-8969-454a-94be-1e24388e7ed4.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4842",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2f5b48a63cc3e7bc5f36d46808e9d52d\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D30A26:F67237:5D74ACCE"
-    }
-  },
-  "uuid": "1a6fbb20-8969-454a-94be-1e24388e7ed4",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8.json
new file mode 100644
index 0000000000..36d0bce14d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/repos_github-api-test-org_github-api_pulls_270-8.json
@@ -0,0 +1,54 @@
+{
+  "id": "1a6fbb20-8969-454a-94be-1e24388e7ed4",
+  "name": "repos_github-api-test-org_github-api_pulls_270",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/270",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_270-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4842",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2f5b48a63cc3e7bc5f36d46808e9d52d\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D30A26:F67237:5D74ACCE"
+    }
+  },
+  "uuid": "1a6fbb20-8969-454a-94be-1e24388e7ed4",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1-c4d4d6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1-c4d4d6.json
deleted file mode 100644
index 233559a8cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1-c4d4d6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c4d4d68f-a141-4fad-a2c9-539e3a21fe94",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c4d4d68f-a141-4fad-a2c9-539e3a21fe94.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4849",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9A:15CE:D3086F:F6703D:5D74ACCB"
-    }
-  },
-  "uuid": "c4d4d68f-a141-4fad-a2c9-539e3a21fe94",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1.json
new file mode 100644
index 0000000000..07457782ed
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/createPullRequestComment/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c4d4d68f-a141-4fad-a2c9-539e3a21fe94",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4849",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9A:15CE:D3086F:F6703D:5D74ACCB"
+    }
+  },
+  "uuid": "c4d4d68f-a141-4fad-a2c9-539e3a21fe94",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/orgs_github-api-test-org-9700f9b4-6787-4942-94bd-1e47116da93b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/orgs_github-api-test-org-9700f9b4-6787-4942-94bd-1e47116da93b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-c0d68f0b-8041-4a02-902c-e277971f2364.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-c0d68f0b-8041-4a02-902c-e277971f2364.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-e79ad56e-9598-45d0-854b-d3b1596e0bf0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-e79ad56e-9598-45d0-854b-d3b1596e0bf0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-43e6882d-8843-479b-8da0-0de90a6edc39.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-43e6882d-8843-479b-8da0-0de90a6edc39.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-ab230383-b8a2-4e18-848c-31637758036c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-ab230383-b8a2-4e18-848c-31637758036c.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-5f8eb032-94f9-4306-922e-21141d15228b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-5f8eb032-94f9-4306-922e-21141d15228b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-344c3bf1-68d8-4ed4-8d28-31f06f7ef465.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-344c3bf1-68d8-4ed4-8d28-31f06f7ef465.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-e32f79db-5f0b-4b94-b7ee-540ef61d9fc2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-e32f79db-5f0b-4b94-b7ee-540ef61d9fc2.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-efb36413-ff3e-4b8b-af82-e5fe336051e8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-efb36413-ff3e-4b8b-af82-e5fe336051e8.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-034f14a1-2ee6-4451-b553-d02da875468e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-034f14a1-2ee6-4451-b553-d02da875468e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/repos_github-api-test-org_github-api_pulls_263-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/user-07979842-29a1-401d-be2b-0c5847525fc3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/user-07979842-29a1-401d-be2b-0c5847525fc3.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2-9700f9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2-9700f9.json
deleted file mode 100644
index 9cdb55a5d4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2-9700f9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9700f9b4-6787-4942-94bd-1e47116da93b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-9700f9b4-6787-4942-94bd-1e47116da93b.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4921",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9D7C:BB5993:5D74ACAD"
-    }
-  },
-  "uuid": "9700f9b4-6787-4942-94bd-1e47116da93b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..baa7228d31
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "9700f9b4-6787-4942-94bd-1e47116da93b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4921",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9D7C:BB5993:5D74ACAD"
+    }
+  },
+  "uuid": "9700f9b4-6787-4942-94bd-1e47116da93b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3-c0d68f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3-c0d68f.json
deleted file mode 100644
index ba7dc124ef..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3-c0d68f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c0d68f0b-8041-4a02-902c-e277971f2364",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-c0d68f0b-8041-4a02-902c-e277971f2364.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4920",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"13a1a11862cbe1a1cb1a31c2ab3af9be\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9D8A:BB59A4:5D74ACAD"
-    }
-  },
-  "uuid": "c0d68f0b-8041-4a02-902c-e277971f2364",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..430f1b8cbb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "c0d68f0b-8041-4a02-902c-e277971f2364",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4920",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"13a1a11862cbe1a1cb1a31c2ab3af9be\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9D8A:BB59A4:5D74ACAD"
+    }
+  },
+  "uuid": "c0d68f0b-8041-4a02-902c-e277971f2364",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5-e79ad5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5-e79ad5.json
deleted file mode 100644
index b8b4b8fab7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5-e79ad5.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "e79ad56e-9598-45d0-854b-d3b1596e0bf0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-e79ad56e-9598-45d0-854b-d3b1596e0bf0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4918",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a0fc415e3a03487befd847db032ba7b0\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9DDD:BB59FC:5D74ACAE"
-    }
-  },
-  "uuid": "e79ad56e-9598-45d0-854b-d3b1596e0bf0",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..c92bd826df
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "e79ad56e-9598-45d0-854b-d3b1596e0bf0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4918",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a0fc415e3a03487befd847db032ba7b0\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9DDD:BB59FC:5D74ACAE"
+    }
+  },
+  "uuid": "e79ad56e-9598-45d0-854b-d3b1596e0bf0",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7-43e688.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7-43e688.json
deleted file mode 100644
index fda80db7df..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7-43e688.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "43e6882d-8843-479b-8da0-0de90a6edc39",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-43e6882d-8843-479b-8da0-0de90a6edc39.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4915",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a9119a5f5499b471a95c911f2727452f\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9E34:BB5A3C:5D74ACAF"
-    }
-  },
-  "uuid": "43e6882d-8843-479b-8da0-0de90a6edc39",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..a23cee00be
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,51 @@
+{
+  "id": "43e6882d-8843-479b-8da0-0de90a6edc39",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4915",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a9119a5f5499b471a95c911f2727452f\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9E34:BB5A3C:5D74ACAF"
+    }
+  },
+  "uuid": "43e6882d-8843-479b-8da0-0de90a6edc39",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9-ab2303.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9-ab2303.json
deleted file mode 100644
index 07d3df5bba..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9-ab2303.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ab230383-b8a2-4e18-848c-31637758036c",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ab230383-b8a2-4e18-848c-31637758036c.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4912",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a9119a5f5499b471a95c911f2727452f\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9E6E:BB5A9F:5D74ACB0"
-    }
-  },
-  "uuid": "ab230383-b8a2-4e18-848c-31637758036c",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9.json
new file mode 100644
index 0000000000..f90f9aeb0f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "ab230383-b8a2-4e18-848c-31637758036c",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4912",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a9119a5f5499b471a95c911f2727452f\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9E6E:BB5A9F:5D74ACB0"
+    }
+  },
+  "uuid": "ab230383-b8a2-4e18-848c-31637758036c",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10-5f8eb0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10-5f8eb0.json
deleted file mode 100644
index f6decf45b7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10-5f8eb0.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "5f8eb032-94f9-4306-922e-21141d15228b",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-5f8eb032-94f9-4306-922e-21141d15228b.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4911",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ae049259cbd6beea8bb740e966c52803\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9E7E:BB5AC0:5D74ACB0"
-    }
-  },
-  "uuid": "5f8eb032-94f9-4306-922e-21141d15228b",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls",
-  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-2",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10.json
new file mode 100644
index 0000000000..6e8be63c3f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-10.json
@@ -0,0 +1,49 @@
+{
+  "id": "5f8eb032-94f9-4306-922e-21141d15228b",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4911",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ae049259cbd6beea8bb740e966c52803\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9E7E:BB5AC0:5D74ACB0"
+    }
+  },
+  "uuid": "5f8eb032-94f9-4306-922e-21141d15228b",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls",
+  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-2",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4-344c3b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4-344c3b.json
deleted file mode 100644
index 1d2d8ee75b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4-344c3b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "344c3bf1-68d8-4ed4-8d28-31f06f7ef465",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"getUserTest\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-344c3bf1-68d8-4ed4-8d28-31f06f7ef465.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"d655d1d53611f46e0047b8bf06c075c5\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/263",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9D97:BB59B5:5D74ACAD"
-    }
-  },
-  "uuid": "344c3bf1-68d8-4ed4-8d28-31f06f7ef465",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..37a71da890
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "344c3bf1-68d8-4ed4-8d28-31f06f7ef465",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"getUserTest\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d655d1d53611f46e0047b8bf06c075c5\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/263",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9D97:BB59B5:5D74ACAD"
+    }
+  },
+  "uuid": "344c3bf1-68d8-4ed4-8d28-31f06f7ef465",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8-e32f79.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8-e32f79.json
deleted file mode 100644
index 85cc5c135c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8-e32f79.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "e32f79db-5f0b-4b94-b7ee-540ef61d9fc2",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-e32f79db-5f0b-4b94-b7ee-540ef61d9fc2.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4914",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ae049259cbd6beea8bb740e966c52803\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9E56:BB5A83:5D74ACAF"
-    }
-  },
-  "uuid": "e32f79db-5f0b-4b94-b7ee-540ef61d9fc2",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-2",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8.json
new file mode 100644
index 0000000000..aaa5f8737c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls-8.json
@@ -0,0 +1,50 @@
+{
+  "id": "e32f79db-5f0b-4b94-b7ee-540ef61d9fc2",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4914",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ae049259cbd6beea8bb740e966c52803\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9E56:BB5A83:5D74ACAF"
+    }
+  },
+  "uuid": "e32f79db-5f0b-4b94-b7ee-540ef61d9fc2",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-2",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11-efb364.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11-efb364.json
deleted file mode 100644
index 9538ad9db1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11-efb364.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "efb36413-ff3e-4b8b-af82-e5fe336051e8",
-  "name": "repos_github-api-test-org_github-api_pulls_263",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/263",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_263-efb36413-ff3e-4b8b-af82-e5fe336051e8.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4910",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f2daf1c39b599ee1902c088c320fdd61\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9E98:BB5AD8:5D74ACB0"
-    }
-  },
-  "uuid": "efb36413-ff3e-4b8b-af82-e5fe336051e8",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11.json
new file mode 100644
index 0000000000..05579eb21a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-11.json
@@ -0,0 +1,54 @@
+{
+  "id": "efb36413-ff3e-4b8b-af82-e5fe336051e8",
+  "name": "repos_github-api-test-org_github-api_pulls_263",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/263",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_263-11.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f2daf1c39b599ee1902c088c320fdd61\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9E98:BB5AD8:5D74ACB0"
+    }
+  },
+  "uuid": "efb36413-ff3e-4b8b-af82-e5fe336051e8",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6-034f14.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6-034f14.json
deleted file mode 100644
index 3a67d8a126..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6-034f14.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "034f14a1-2ee6-4451-b553-d02da875468e",
-  "name": "repos_github-api-test-org_github-api_pulls_263",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/263",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_263-034f14a1-2ee6-4451-b553-d02da875468e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4917",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4c8aaa43a928ad60788c6298a0cf826a\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9DFA:BB5A1D:5D74ACAE"
-    }
-  },
-  "uuid": "034f14a1-2ee6-4451-b553-d02da875468e",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6.json
new file mode 100644
index 0000000000..f73566eb6c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/repos_github-api-test-org_github-api_pulls_263-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "034f14a1-2ee6-4451-b553-d02da875468e",
+  "name": "repos_github-api-test-org_github-api_pulls_263",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/263",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_263-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4917",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4c8aaa43a928ad60788c6298a0cf826a\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9DFA:BB5A1D:5D74ACAE"
+    }
+  },
+  "uuid": "034f14a1-2ee6-4451-b553-d02da875468e",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1-079798.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1-079798.json
deleted file mode 100644
index f5e984e093..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1-079798.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "07979842-29a1-401d-be2b-0c5847525fc3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-07979842-29a1-401d-be2b-0c5847525fc3.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF84:9A32:9E9D71:BB5986:5D74ACAD"
-    }
-  },
-  "uuid": "07979842-29a1-401d-be2b-0c5847525fc3",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1.json
new file mode 100644
index 0000000000..959574a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/getUserTest/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "07979842-29a1-401d-be2b-0c5847525fc3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF84:9A32:9E9D71:BB5986:5D74ACAD"
+    }
+  },
+  "uuid": "07979842-29a1-401d-be2b-0c5847525fc3",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/repos_github-api-test-org_github-api_pulls_309-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json
deleted file mode 100644
index 1f7a6c2386..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2-e3ff36.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e3ff360d-d2e8-48a3-aaa4-38a5acd11580",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-e3ff360d-d2e8-48a3-aaa4-38a5acd11580.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4894",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D397A1:FC6B78:5D990709"
-    }
-  },
-  "uuid": "e3ff360d-d2e8-48a3-aaa4-38a5acd11580",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..7bbc80609a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "e3ff360d-d2e8-48a3-aaa4-38a5acd11580",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4894",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D397A1:FC6B78:5D990709"
+    }
+  },
+  "uuid": "e3ff360d-d2e8-48a3-aaa4-38a5acd11580",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json
deleted file mode 100644
index 580ef3f370..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3-7a223c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7a223c60-fbe1-4ed6-b30d-617b9ca84e8e",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-7a223c60-fbe1-4ed6-b30d-617b9ca84e8e.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4893",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be90246cc993b01cbcfdf5cf4455dd5e\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D397A5:FC6BA6:5D99070A"
-    }
-  },
-  "uuid": "7a223c60-fbe1-4ed6-b30d-617b9ca84e8e",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..b07055cc77
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "7a223c60-fbe1-4ed6-b30d-617b9ca84e8e",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4893",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be90246cc993b01cbcfdf5cf4455dd5e\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D397A5:FC6BA6:5D99070A"
+    }
+  },
+  "uuid": "7a223c60-fbe1-4ed6-b30d-617b9ca84e8e",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json
deleted file mode 100644
index 1f1234b101..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8-59cc88.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "59cc8825-ac31-418a-b4ae-47fd733fd3e1",
-  "name": "repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/commits/48eb1a9b8cd56782d11ea45adcf062eade17528e",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-59cc8825-ac31-418a-b4ae-47fd733fd3e1.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4888",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"857c6e4332bf6ace84e0f8c8eca1f234\"",
-      "Last-Modified": "Sat, 05 Oct 2019 21:11:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D3984D:FC6C67:5D99070F"
-    }
-  },
-  "uuid": "59cc8825-ac31-418a-b4ae-47fd733fd3e1",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json
new file mode 100644
index 0000000000..e29c7b5b78
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "59cc8825-ac31-418a-b4ae-47fd733fd3e1",
+  "name": "repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/commits/48eb1a9b8cd56782d11ea45adcf062eade17528e",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_commits_48eb1a9b8cd56782d11ea45adcf062eade17528e-8.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4888",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"857c6e4332bf6ace84e0f8c8eca1f234\"",
+      "Last-Modified": "Sat, 05 Oct 2019 21:11:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D3984D:FC6C67:5D99070F"
+    }
+  },
+  "uuid": "59cc8825-ac31-418a-b4ae-47fd733fd3e1",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json
deleted file mode 100644
index ecd068af4b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4-361c15.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "361c15b4-b52d-4da7-a810-bfabf94e819a",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/mergeable_branch\",\"maintainer_can_modify\":true,\"title\":\"mergeCommitSHA\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-361c15b4-b52d-4da7-a810-bfabf94e819a.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4892",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"9960683cf7257316abbf7d1515d2c274\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D397AD:FC6BB1:5D99070B"
-    }
-  },
-  "uuid": "361c15b4-b52d-4da7-a810-bfabf94e819a",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..212f9afd30
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "361c15b4-b52d-4da7-a810-bfabf94e819a",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/mergeable_branch\",\"maintainer_can_modify\":true,\"title\":\"mergeCommitSHA\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4892",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"9960683cf7257316abbf7d1515d2c274\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/309",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D397AD:FC6BB1:5D99070B"
+    }
+  },
+  "uuid": "361c15b4-b52d-4da7-a810-bfabf94e819a",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json
deleted file mode 100644
index 2cdb6304eb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5-1566b3.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1566b3f6-560a-4c1c-a6cd-bdaa25774c7a",
-  "name": "repos_github-api-test-org_github-api_pulls_309",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/309",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-1566b3f6-560a-4c1c-a6cd-bdaa25774c7a.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4891",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9960683cf7257316abbf7d1515d2c274\"",
-      "Last-Modified": "Sat, 05 Oct 2019 21:11:40 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D3980B:FC6C1B:5D99070D"
-    }
-  },
-  "uuid": "1566b3f6-560a-4c1c-a6cd-bdaa25774c7a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-2",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5.json
new file mode 100644
index 0000000000..719b727bcf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "1566b3f6-560a-4c1c-a6cd-bdaa25774c7a",
+  "name": "repos_github-api-test-org_github-api_pulls_309",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/309",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-5.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4891",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9960683cf7257316abbf7d1515d2c274\"",
+      "Last-Modified": "Sat, 05 Oct 2019 21:11:40 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D3980B:FC6C1B:5D99070D"
+    }
+  },
+  "uuid": "1566b3f6-560a-4c1c-a6cd-bdaa25774c7a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-2",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json
deleted file mode 100644
index 251b7ccd5d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6-c8fd7b.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c8fd7b5e-b5f3-4179-bb56-1f2b150f248d",
-  "name": "repos_github-api-test-org_github-api_pulls_309",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/309",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-c8fd7b5e-b5f3-4179-bb56-1f2b150f248d.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4890",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e69c3fd661d08c3ffd1d054d9efc7f5c\"",
-      "Last-Modified": "Sat, 05 Oct 2019 21:11:40 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D39817:FC6C31:5D99070D"
-    }
-  },
-  "uuid": "c8fd7b5e-b5f3-4179-bb56-1f2b150f248d",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-3",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6.json
new file mode 100644
index 0000000000..c99ae9122b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "c8fd7b5e-b5f3-4179-bb56-1f2b150f248d",
+  "name": "repos_github-api-test-org_github-api_pulls_309",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/309",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-6.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4890",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e69c3fd661d08c3ffd1d054d9efc7f5c\"",
+      "Last-Modified": "Sat, 05 Oct 2019 21:11:40 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D39817:FC6C31:5D99070D"
+    }
+  },
+  "uuid": "c8fd7b5e-b5f3-4179-bb56-1f2b150f248d",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-3",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json
deleted file mode 100644
index ca8c611313..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7-979661.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "97966102-337f-4c57-8b20-ba00a3769317",
-  "name": "repos_github-api-test-org_github-api_pulls_309",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/309",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-97966102-337f-4c57-8b20-ba00a3769317.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4889",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7e7fd7b9217593932b122cb8a1f3675b\"",
-      "Last-Modified": "Sat, 05 Oct 2019 21:11:40 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D39841:FC6C3B:5D99070D"
-    }
-  },
-  "uuid": "97966102-337f-4c57-8b20-ba00a3769317",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-3",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7.json
new file mode 100644
index 0000000000..37e333f4a4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/repos_github-api-test-org_github-api_pulls_309-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "97966102-337f-4c57-8b20-ba00a3769317",
+  "name": "repos_github-api-test-org_github-api_pulls_309",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/309",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_309-7.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4889",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7e7fd7b9217593932b122cb8a1f3675b\"",
+      "Last-Modified": "Sat, 05 Oct 2019 21:11:40 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D39841:FC6C3B:5D99070D"
+    }
+  },
+  "uuid": "97966102-337f-4c57-8b20-ba00a3769317",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api-pulls-309",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-pulls-309-3",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json
deleted file mode 100644
index f086dde40b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1-c2903f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c2903fd5-9175-47e3-b48e-c86bcc461b58",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c2903fd5-9175-47e3-b48e-c86bcc461b58.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 21:11:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1570311642",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E2BB:2CE6:D39774:FC6B6F:5D990709"
-    }
-  },
-  "uuid": "c2903fd5-9175-47e3-b48e-c86bcc461b58",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1.json
new file mode 100644
index 0000000000..fc14a5a3ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/mergeCommitSHA/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c2903fd5-9175-47e3-b48e-c86bcc461b58",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 21:11:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4899",
+      "X-RateLimit-Reset": "1570311642",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E2BB:2CE6:D39774:FC6B6F:5D990709"
+    }
+  },
+  "uuid": "c2903fd5-9175-47e3-b48e-c86bcc461b58",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/orgs_github-api-test-org-079c3da5-3ce3-41f6-aef1-cae0dad71a85.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/orgs_github-api-test-org-079c3da5-3ce3-41f6-aef1-cae0dad71a85.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-9090d20b-28ee-455a-8eb6-e1547d0d3d9e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-9090d20b-28ee-455a-8eb6-e1547d0d3d9e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-d585b5ae-36a9-48d8-931d-7f459bec2b4c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-d585b5ae-36a9-48d8-931d-7f459bec2b4c.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-80451be1-8c40-4a4b-9144-c59e9fb97fd8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-80451be1-8c40-4a4b-9144-c59e9fb97fd8.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-145b4497-4f76-4adf-b16b-ccf1f68c339d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-145b4497-4f76-4adf-b16b-ccf1f68c339d.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266-f8bf7bf6-b583-4573-b3eb-31bbad80e965.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266-f8bf7bf6-b583-4573-b3eb-31bbad80e965.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266-14.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-b9a8cb45-f232-4aa9-a3bf-93f050e40616.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-b9a8cb45-f232-4aa9-a3bf-93f050e40616.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-874427ac-ddf2-4cee-b85c-501b2a3861d7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-874427ac-ddf2-4cee-b85c-501b2a3861d7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-8d629bc2-ccf8-46c5-804d-500af333a156.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-8d629bc2-ccf8-46c5-804d-500af333a156.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_266_comments-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_comments_321995146-d0df7515-482f-4337-aafd-a543346e6076.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_comments_321995146-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_comments_321995146-d0df7515-482f-4337-aafd-a543346e6076.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/repos_github-api-test-org_github-api_pulls_comments_321995146-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/user-f7421985-e210-4b76-b07e-0a00bae61fff.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/user-f7421985-e210-4b76-b07e-0a00bae61fff.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2-079c3d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2-079c3d.json
deleted file mode 100644
index 66eeac4e2c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2-079c3d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "079c3da5-3ce3-41f6-aef1-cae0dad71a85",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-079c3da5-3ce3-41f6-aef1-cae0dad71a85.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4885",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67D6A:E8071B:5D74ACBA"
-    }
-  },
-  "uuid": "079c3da5-3ce3-41f6-aef1-cae0dad71a85",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..7fe31908fa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "079c3da5-3ce3-41f6-aef1-cae0dad71a85",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4885",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67D6A:E8071B:5D74ACBA"
+    }
+  },
+  "uuid": "079c3da5-3ce3-41f6-aef1-cae0dad71a85",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12-9090d2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12-9090d2.json
deleted file mode 100644
index cf89c5cf12..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12-9090d2.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "9090d20b-28ee-455a-8eb6-e1547d0d3d9e",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-9090d20b-28ee-455a-8eb6-e1547d0d3d9e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4875",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9acabc33f9749ffce33a82a36bb6e76d\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67E6D:E80837:5D74ACBE"
-    }
-  },
-  "uuid": "9090d20b-28ee-455a-8eb6-e1547d0d3d9e",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12.json
new file mode 100644
index 0000000000..3d9c8435b4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-12.json
@@ -0,0 +1,50 @@
+{
+  "id": "9090d20b-28ee-455a-8eb6-e1547d0d3d9e",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-12.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4875",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9acabc33f9749ffce33a82a36bb6e76d\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67E6D:E80837:5D74ACBE"
+    }
+  },
+  "uuid": "9090d20b-28ee-455a-8eb6-e1547d0d3d9e",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3-d585b5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3-d585b5.json
deleted file mode 100644
index fd1cd340b4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3-d585b5.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "d585b5ae-36a9-48d8-931d-7f459bec2b4c",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-d585b5ae-36a9-48d8-931d-7f459bec2b4c.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4884",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7769c7e717cc7cf93b574833c03b891d\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67D75:E80727:5D74ACBB"
-    }
-  },
-  "uuid": "d585b5ae-36a9-48d8-931d-7f459bec2b4c",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..71b3d6492e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "d585b5ae-36a9-48d8-931d-7f459bec2b4c",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4884",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7769c7e717cc7cf93b574833c03b891d\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67D75:E80727:5D74ACBB"
+    }
+  },
+  "uuid": "d585b5ae-36a9-48d8-931d-7f459bec2b4c",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13-80451b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13-80451b.json
deleted file mode 100644
index de03b9ab44..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13-80451b.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "80451be1-8c40-4a4b-9144-c59e9fb97fd8",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-80451be1-8c40-4a4b-9144-c59e9fb97fd8.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4874",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"18012acfc0962da8b2ede3a910fa5178\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67E7F:E8084B:5D74ACBE"
-    }
-  },
-  "uuid": "80451be1-8c40-4a4b-9144-c59e9fb97fd8",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13.json
new file mode 100644
index 0000000000..9a1285dca2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-13.json
@@ -0,0 +1,47 @@
+{
+  "id": "80451be1-8c40-4a4b-9144-c59e9fb97fd8",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-13.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4874",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"18012acfc0962da8b2ede3a910fa5178\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67E7F:E8084B:5D74ACBE"
+    }
+  },
+  "uuid": "80451be1-8c40-4a4b-9144-c59e9fb97fd8",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4-145b44.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4-145b44.json
deleted file mode 100644
index f823013070..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4-145b44.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "145b4497-4f76-4adf-b16b-ccf1f68c339d",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"pullRequestReviewComments\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-145b4497-4f76-4adf-b16b-ccf1f68c339d.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:43 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4883",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"a2827455894688a5faa5da779190bb2c\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/266",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67D86:E8073B:5D74ACBB"
-    }
-  },
-  "uuid": "145b4497-4f76-4adf-b16b-ccf1f68c339d",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..cb696ca905
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "145b4497-4f76-4adf-b16b-ccf1f68c339d",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"pullRequestReviewComments\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:43 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4883",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"a2827455894688a5faa5da779190bb2c\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/266",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67D86:E8073B:5D74ACBB"
+    }
+  },
+  "uuid": "145b4497-4f76-4adf-b16b-ccf1f68c339d",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14-f8bf7b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14-f8bf7b.json
deleted file mode 100644
index 793f6cb4b7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14-f8bf7b.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "f8bf7bf6-b583-4573-b3eb-31bbad80e965",
-  "name": "repos_github-api-test-org_github-api_pulls_266",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/266",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266-f8bf7bf6-b583-4573-b3eb-31bbad80e965.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4873",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c0645af133a441f679a6966ea56da287\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67E97:E80863:5D74ACBE"
-    }
-  },
-  "uuid": "f8bf7bf6-b583-4573-b3eb-31bbad80e965",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14.json
new file mode 100644
index 0000000000..1dc7b8707f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266-14.json
@@ -0,0 +1,54 @@
+{
+  "id": "f8bf7bf6-b583-4573-b3eb-31bbad80e965",
+  "name": "repos_github-api-test-org_github-api_pulls_266",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/266",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266-14.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4873",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c0645af133a441f679a6966ea56da287\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67E97:E80863:5D74ACBE"
+    }
+  },
+  "uuid": "f8bf7bf6-b583-4573-b3eb-31bbad80e965",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-11-b8142f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-11-b8142f.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-5-cbd425.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-5-cbd425.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6-b9a8cb.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6-b9a8cb.json
deleted file mode 100644
index 32c880c7f6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6-b9a8cb.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "b9a8cb45-f232-4aa9-a3bf-93f050e40616",
-  "name": "repos_github-api-test-org_github-api_pulls_266_comments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/266/comments",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"README.md\",\"position\":1,\"body\":\"Sample review comment\",\"commit_id\":\"2d29c787b46ce61b98a1c13e05e21ebc21f49dbf\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266_comments-b9a8cb45-f232-4aa9-a3bf-93f050e40616.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4881",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"1e5fb97b3f4a5335008f4d7b18498e9d\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments/321995146",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67DD2:E8078D:5D74ACBC"
-    }
-  },
-  "uuid": "b9a8cb45-f232-4aa9-a3bf-93f050e40616",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6.json
new file mode 100644
index 0000000000..4e17bac0bc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "b9a8cb45-f232-4aa9-a3bf-93f050e40616",
+  "name": "repos_github-api-test-org_github-api_pulls_266_comments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/266/comments",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"README.md\",\"position\":1,\"body\":\"Sample review comment\",\"commit_id\":\"2d29c787b46ce61b98a1c13e05e21ebc21f49dbf\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266_comments-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4881",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"1e5fb97b3f4a5335008f4d7b18498e9d\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/comments/321995146",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67DD2:E8078D:5D74ACBC"
+    }
+  },
+  "uuid": "b9a8cb45-f232-4aa9-a3bf-93f050e40616",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7-874427.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7-874427.json
deleted file mode 100644
index ef3e943162..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7-874427.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "874427ac-ddf2-4cee-b85c-501b2a3861d7",
-  "name": "repos_github-api-test-org_github-api_pulls_266_comments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/266/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266_comments-874427ac-ddf2-4cee-b85c-501b2a3861d7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4880",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5744dfa02066cbc244887629e9a78919\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67E05:E807B8:5D74ACBC"
-    }
-  },
-  "uuid": "874427ac-ddf2-4cee-b85c-501b2a3861d7",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments",
-  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-2",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-3",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7.json
new file mode 100644
index 0000000000..f15f8304aa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "874427ac-ddf2-4cee-b85c-501b2a3861d7",
+  "name": "repos_github-api-test-org_github-api_pulls_266_comments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/266/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266_comments-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4880",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5744dfa02066cbc244887629e9a78919\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67E05:E807B8:5D74ACBC"
+    }
+  },
+  "uuid": "874427ac-ddf2-4cee-b85c-501b2a3861d7",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments",
+  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-2",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-3",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9-8d629b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9-8d629b.json
deleted file mode 100644
index 31eaeed72b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9-8d629b.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "8d629bc2-ccf8-46c5-804d-500af333a156",
-  "name": "repos_github-api-test-org_github-api_pulls_266_comments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/266/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266_comments-8d629bc2-ccf8-46c5-804d-500af333a156.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4878",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"004c8f4b66ed0d9ad14c2f19e71e962a\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67E36:E807F0:5D74ACBD"
-    }
-  },
-  "uuid": "8d629bc2-ccf8-46c5-804d-500af333a156",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments",
-  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-3",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-4",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9.json
new file mode 100644
index 0000000000..e5409e1984
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_266_comments-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "8d629bc2-ccf8-46c5-804d-500af333a156",
+  "name": "repos_github-api-test-org_github-api_pulls_266_comments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/266/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_266_comments-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4878",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"004c8f4b66ed0d9ad14c2f19e71e962a\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67E36:E807F0:5D74ACBD"
+    }
+  },
+  "uuid": "8d629bc2-ccf8-46c5-804d-500af333a156",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments",
+  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-3",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-pulls-266-comments-4",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-10-73e6aa.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-10-73e6aa.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8-d0df75.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8-d0df75.json
deleted file mode 100644
index a55a2181f5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8-d0df75.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "d0df7515-482f-4337-aafd-a543346e6076",
-  "name": "repos_github-api-test-org_github-api_pulls_comments_321995146",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/comments/321995146",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"body\":\"Updated review comment\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_comments_321995146-d0df7515-482f-4337-aafd-a543346e6076.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4879",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0c3324b1da01161140a88fc125c27562\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67E12:E807D1:5D74ACBD"
-    }
-  },
-  "uuid": "d0df7515-482f-4337-aafd-a543346e6076",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8.json
new file mode 100644
index 0000000000..ec23a43593
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/repos_github-api-test-org_github-api_pulls_comments_321995146-8.json
@@ -0,0 +1,54 @@
+{
+  "id": "d0df7515-482f-4337-aafd-a543346e6076",
+  "name": "repos_github-api-test-org_github-api_pulls_comments_321995146",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/comments/321995146",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"body\":\"Updated review comment\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_comments_321995146-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4879",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0c3324b1da01161140a88fc125c27562\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67E12:E807D1:5D74ACBD"
+    }
+  },
+  "uuid": "d0df7515-482f-4337-aafd-a543346e6076",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1-f74219.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1-f74219.json
deleted file mode 100644
index 2a27af531b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1-f74219.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f7421985-e210-4b76-b07e-0a00bae61fff",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f7421985-e210-4b76-b07e-0a00bae61fff.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4886",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF91:40BD:C67D5C:E8070E:5D74ACBA"
-    }
-  },
-  "uuid": "f7421985-e210-4b76-b07e-0a00bae61fff",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1.json
new file mode 100644
index 0000000000..1ff0ed34b4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviewComments/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f7421985-e210-4b76-b07e-0a00bae61fff",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4886",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF91:40BD:C67D5C:E8070E:5D74ACBA"
+    }
+  },
+  "uuid": "f7421985-e210-4b76-b07e-0a00bae61fff",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/orgs_github-api-test-org-3f761467-4b55-4250-8764-14a1f83cdf7b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/orgs_github-api-test-org-3f761467-4b55-4250-8764-14a1f83cdf7b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-029a5710-e19a-4db2-8b79-49123309a3bf.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-029a5710-e19a-4db2-8b79-49123309a3bf.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-1efd2ad4-e334-47e1-aaa8-8588bb117bb0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-1efd2ad4-e334-47e1-aaa8-8588bb117bb0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-0c75c020-a12d-4d29-a43f-401e5d479b4a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-0c75c020-a12d-4d29-a43f-401e5d479b4a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-7f209593-4b8d-4fc8-97e2-10704e6683b7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-7f209593-4b8d-4fc8-97e2-10704e6683b7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258-9406e54b-fdf7-40d5-a51b-3c27d7b050d8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258-9406e54b-fdf7-40d5-a51b-3c27d7b050d8.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-1fe517d8-5707-4f17-a46a-e58d3abb5991.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-1fe517d8-5707-4f17-a46a-e58d3abb5991.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-56d54933-fb91-4e3e-8baa-245b5b7db8b2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-56d54933-fb91-4e3e-8baa-245b5b7db8b2.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-be8b553c-77cf-4904-9d74-92787d422007.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-be8b553c-77cf-4904-9d74-92787d422007.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-15c1e28b-6415-4c72-8a9a-bf0e88ca9364.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-15c1e28b-6415-4c72-8a9a-bf0e88ca9364.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-d0f59a93-6a4d-4841-b4ec-a6b5d43747ea.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-d0f59a93-6a4d-4841-b4ec-a6b5d43747ea.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-886b3f8b-a7c0-4844-95a5-3f674898edb0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-886b3f8b-a7c0-4844-95a5-3f674898edb0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/user-e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/user-e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2-3f7614.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2-3f7614.json
deleted file mode 100644
index 0f281ea310..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2-3f7614.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3f761467-4b55-4250-8764-14a1f83cdf7b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-3f761467-4b55-4250-8764-14a1f83cdf7b.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54F2A:E72692:5D74AC97"
-    }
-  },
-  "uuid": "3f761467-4b55-4250-8764-14a1f83cdf7b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..4b462bdc41
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "3f761467-4b55-4250-8764-14a1f83cdf7b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54F2A:E72692:5D74AC97"
+    }
+  },
+  "uuid": "3f761467-4b55-4250-8764-14a1f83cdf7b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11-029a57.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11-029a57.json
deleted file mode 100644
index 6ede93e50b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11-029a57.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "029a5710-e19a-4db2-8b79-49123309a3bf",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-029a5710-e19a-4db2-8b79-49123309a3bf.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4957",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e4740efc748837c4fa4fd291af5e7a4f\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C5507A:E72820:5D74AC9C"
-    }
-  },
-  "uuid": "029a5710-e19a-4db2-8b79-49123309a3bf",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11.json
new file mode 100644
index 0000000000..db52fa91ae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-11.json
@@ -0,0 +1,50 @@
+{
+  "id": "029a5710-e19a-4db2-8b79-49123309a3bf",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-11.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4957",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e4740efc748837c4fa4fd291af5e7a4f\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C5507A:E72820:5D74AC9C"
+    }
+  },
+  "uuid": "029a5710-e19a-4db2-8b79-49123309a3bf",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3-1efd2a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3-1efd2a.json
deleted file mode 100644
index fae2f93cfd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3-1efd2a.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1efd2ad4-e334-47e1-aaa8-8588bb117bb0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1efd2ad4-e334-47e1-aaa8-8588bb117bb0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4965",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ca547e62bc7fe17adb3502e01ebf153d\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54F50:E726C1:5D74AC98"
-    }
-  },
-  "uuid": "1efd2ad4-e334-47e1-aaa8-8588bb117bb0",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..76ffa78f42
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "1efd2ad4-e334-47e1-aaa8-8588bb117bb0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4965",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ca547e62bc7fe17adb3502e01ebf153d\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54F50:E726C1:5D74AC98"
+    }
+  },
+  "uuid": "1efd2ad4-e334-47e1-aaa8-8588bb117bb0",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12-0c75c0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12-0c75c0.json
deleted file mode 100644
index 517831c0a9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12-0c75c0.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "0c75c020-a12d-4d29-a43f-401e5d479b4a",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-0c75c020-a12d-4d29-a43f-401e5d479b4a.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4956",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"83235f4a55a52ca3f71050891f545eff\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C5509B:E7283A:5D74AC9C"
-    }
-  },
-  "uuid": "0c75c020-a12d-4d29-a43f-401e5d479b4a",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12.json
new file mode 100644
index 0000000000..cf6a5361ae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-12.json
@@ -0,0 +1,47 @@
+{
+  "id": "0c75c020-a12d-4d29-a43f-401e5d479b4a",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-12.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"83235f4a55a52ca3f71050891f545eff\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C5509B:E7283A:5D74AC9C"
+    }
+  },
+  "uuid": "0c75c020-a12d-4d29-a43f-401e5d479b4a",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4-7f2095.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4-7f2095.json
deleted file mode 100644
index 8bee1fa4b1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4-7f2095.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "7f209593-4b8d-4fc8-97e2-10704e6683b7",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"testPullRequestReviews\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-7f209593-4b8d-4fc8-97e2-10704e6683b7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"b0598a7316847a33e8c3d97547451bb9\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/258",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54F67:E726E5:5D74AC98"
-    }
-  },
-  "uuid": "7f209593-4b8d-4fc8-97e2-10704e6683b7",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..21fb07aaf6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "7f209593-4b8d-4fc8-97e2-10704e6683b7",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"testPullRequestReviews\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"b0598a7316847a33e8c3d97547451bb9\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/258",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54F67:E726E5:5D74AC98"
+    }
+  },
+  "uuid": "7f209593-4b8d-4fc8-97e2-10704e6683b7",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13-9406e5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13-9406e5.json
deleted file mode 100644
index 77339ec3cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13-9406e5.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "9406e54b-fdf7-40d5-a51b-3c27d7b050d8",
-  "name": "repos_github-api-test-org_github-api_pulls_258",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258-9406e54b-fdf7-40d5-a51b-3c27d7b050d8.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4955",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"88adcbc08092f5a33384d5818f3a59b8\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C550A8:E72856:5D74AC9C"
-    }
-  },
-  "uuid": "9406e54b-fdf7-40d5-a51b-3c27d7b050d8",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13.json
new file mode 100644
index 0000000000..94239ee61a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258-13.json
@@ -0,0 +1,54 @@
+{
+  "id": "9406e54b-fdf7-40d5-a51b-3c27d7b050d8",
+  "name": "repos_github-api-test-org_github-api_pulls_258",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258-13.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4955",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"88adcbc08092f5a33384d5818f3a59b8\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C550A8:E72856:5D74AC9C"
+    }
+  },
+  "uuid": "9406e54b-fdf7-40d5-a51b-3c27d7b050d8",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5-1fe517.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5-1fe517.json
deleted file mode 100644
index 60cd01e4f3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5-1fe517.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "1fe517d8-5707-4f17-a46a-e58d3abb5991",
-  "name": "repos_github-api-test-org_github-api_pulls_258_reviews",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"comments\":[{\"body\":\"Some niggle\",\"path\":\"README.md\",\"position\":1}],\"body\":\"Some draft review\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews-1fe517d8-5707-4f17-a46a-e58d3abb5991.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4963",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"661a313c46838fe76465f0af8e8c8d11\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54FA8:E7272B:5D74AC99"
-    }
-  },
-  "uuid": "1fe517d8-5707-4f17-a46a-e58d3abb5991",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5.json
new file mode 100644
index 0000000000..5d6262fd25
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "1fe517d8-5707-4f17-a46a-e58d3abb5991",
+  "name": "repos_github-api-test-org_github-api_pulls_258_reviews",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"comments\":[{\"body\":\"Some niggle\",\"path\":\"README.md\",\"position\":1}],\"body\":\"Some draft review\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4963",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"661a313c46838fe76465f0af8e8c8d11\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54FA8:E7272B:5D74AC99"
+    }
+  },
+  "uuid": "1fe517d8-5707-4f17-a46a-e58d3abb5991",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6-56d549.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6-56d549.json
deleted file mode 100644
index 094b7a9e0c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6-56d549.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "56d54933-fb91-4e3e-8baa-245b5b7db8b2",
-  "name": "repos_github-api-test-org_github-api_pulls_258_reviews",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews-56d54933-fb91-4e3e-8baa-245b5b7db8b2.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"826dd9da68be423cddfb11926f611eed\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54FD2:E72760:5D74AC9A"
-    }
-  },
-  "uuid": "56d54933-fb91-4e3e-8baa-245b5b7db8b2",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6.json
new file mode 100644
index 0000000000..17ae48154d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-6.json
@@ -0,0 +1,47 @@
+{
+  "id": "56d54933-fb91-4e3e-8baa-245b5b7db8b2",
+  "name": "repos_github-api-test-org_github-api_pulls_258_reviews",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"826dd9da68be423cddfb11926f611eed\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54FD2:E72760:5D74AC9A"
+    }
+  },
+  "uuid": "56d54933-fb91-4e3e-8baa-245b5b7db8b2",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9-be8b55.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9-be8b55.json
deleted file mode 100644
index c1e3d82dce..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9-be8b55.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "be8b553c-77cf-4904-9d74-92787d422007",
-  "name": "repos_github-api-test-org_github-api_pulls_258_reviews",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"comments\":[{\"body\":\"Some niggle\",\"path\":\"README.md\",\"position\":1}],\"body\":\"Some new review\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews-be8b553c-77cf-4904-9d74-92787d422007.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4959",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5983db55f65865c2c1a33d7f3ac2e2b5\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C55034:E727CF:5D74AC9B"
-    }
-  },
-  "uuid": "be8b553c-77cf-4904-9d74-92787d422007",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9.json
new file mode 100644
index 0000000000..ac7fd3ca83
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews-9.json
@@ -0,0 +1,54 @@
+{
+  "id": "be8b553c-77cf-4904-9d74-92787d422007",
+  "name": "repos_github-api-test-org_github-api_pulls_258_reviews",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"comments\":[{\"body\":\"Some niggle\",\"path\":\"README.md\",\"position\":1}],\"body\":\"Some new review\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5983db55f65865c2c1a33d7f3ac2e2b5\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C55034:E727CF:5D74AC9B"
+    }
+  },
+  "uuid": "be8b553c-77cf-4904-9d74-92787d422007",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8-15c1e2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8-15c1e2.json
deleted file mode 100644
index 94187038f2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8-15c1e2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "15c1e28b-6415-4c72-8a9a-bf0e88ca9364",
-  "name": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews/285200956/comments",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-15c1e28b-6415-4c72-8a9a-bf0e88ca9364.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4960",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f277539431581bfcf4e28500219f25e5\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C55023:E727BC:5D74AC9B"
-    }
-  },
-  "uuid": "15c1e28b-6415-4c72-8a9a-bf0e88ca9364",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json
new file mode 100644
index 0000000000..17d060add4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json
@@ -0,0 +1,47 @@
+{
+  "id": "15c1e28b-6415-4c72-8a9a-bf0e88ca9364",
+  "name": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews/285200956/comments",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_comments-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4960",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f277539431581bfcf4e28500219f25e5\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C55023:E727BC:5D74AC9B"
+    }
+  },
+  "uuid": "15c1e28b-6415-4c72-8a9a-bf0e88ca9364",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7-d0f59a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7-d0f59a.json
deleted file mode 100644
index 8ad66c6f55..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7-d0f59a.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "d0f59a93-6a4d-4841-b4ec-a6b5d43747ea",
-  "name": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews/285200956/events",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"body\":\"Some review comment\",\"event\":\"COMMENT\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-d0f59a93-6a4d-4841-b4ec-a6b5d43747ea.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4961",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e944fffdfb00bed59c6411e2d6ce4b56\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54FF2:E7277B:5D74AC9A"
-    }
-  },
-  "uuid": "d0f59a93-6a4d-4841-b4ec-a6b5d43747ea",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json
new file mode 100644
index 0000000000..716720f5b8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json
@@ -0,0 +1,54 @@
+{
+  "id": "d0f59a93-6a4d-4841-b4ec-a6b5d43747ea",
+  "name": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews/285200956/events",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"body\":\"Some review comment\",\"event\":\"COMMENT\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews_285200956_events-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4961",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e944fffdfb00bed59c6411e2d6ce4b56\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54FF2:E7277B:5D74AC9A"
+    }
+  },
+  "uuid": "d0f59a93-6a4d-4841-b4ec-a6b5d43747ea",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10-886b3f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10-886b3f.json
deleted file mode 100644
index 64fdac3e15..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10-886b3f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "886b3f8b-a7c0-4844-95a5-3f674898edb0",
-  "name": "repos_github-api-test-org_github-api_pulls_258_reviews_285200957",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews/285200957",
-    "method": "DELETE",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews_285200957-886b3f8b-a7c0-4844-95a5-3f674898edb0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4958",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5983db55f65865c2c1a33d7f3ac2e2b5\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C55065:E72801:5D74AC9B"
-    }
-  },
-  "uuid": "886b3f8b-a7c0-4844-95a5-3f674898edb0",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json
new file mode 100644
index 0000000000..88fef435f0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json
@@ -0,0 +1,47 @@
+{
+  "id": "886b3f8b-a7c0-4844-95a5-3f674898edb0",
+  "name": "repos_github-api-test-org_github-api_pulls_258_reviews_285200957",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/258/reviews/285200957",
+    "method": "DELETE",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_258_reviews_285200957-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4958",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5983db55f65865c2c1a33d7f3ac2e2b5\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C55065:E72801:5D74AC9B"
+    }
+  },
+  "uuid": "886b3f8b-a7c0-4844-95a5-3f674898edb0",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1-e24b33.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1-e24b33.json
deleted file mode 100644
index 80167e002c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1-e24b33.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF76:0A33:C54F06:E7268A:5D74AC97"
-    }
-  },
-  "uuid": "e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1.json
new file mode 100644
index 0000000000..cff5f34ac0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/pullRequestReviews/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF76:0A33:C54F06:E7268A:5D74AC97"
+    }
+  },
+  "uuid": "e24b3373-c9ca-4d6f-b8cc-93a9d7deb4d0",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/orgs_github-api-test-org-9de3bb03-9dd4-4b5a-a2ac-20e02c951355.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/orgs_github-api-test-org-9de3bb03-9dd4-4b5a-a2ac-20e02c951355.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-f81e5019-7e7f-48df-803a-d47defd3f22d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-f81e5019-7e7f-48df-803a-d47defd3f22d.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-684ed3a1-dca4-42f3-b25a-ebea733d4a02.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-684ed3a1-dca4-42f3-b25a-ebea733d4a02.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-a2c01b93-3f63-418c-bd0b-a5a61b96999f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-a2c01b93-3f63-418c-bd0b-a5a61b96999f.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-9afc3aa9-ac54-4c53-b5e3-3c0793558359.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-9afc3aa9-ac54-4c53-b5e3-3c0793558359.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-ab74613d-0613-47a8-a6fc-34add77d9967.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-ab74613d-0613-47a8-a6fc-34add77d9967.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-4e73cd50-9986-426e-bf13-b7ad18f36be0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-4e73cd50-9986-426e-bf13-b7ad18f36be0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_259-5f1852a8-2f93-46f0-a692-538bb386c436.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_259-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_259-5f1852a8-2f93-46f0-a692-538bb386c436.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_259-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_260-6162e3a9-487d-475a-a4e1-f037c796baf5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_260-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_260-6162e3a9-487d-475a-a4e1-f037c796baf5.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/repos_github-api-test-org_github-api_pulls_260-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/user-4966fe2a-d81e-4b83-acd4-b1c3e2f4f684.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/user-4966fe2a-d81e-4b83-acd4-b1c3e2f4f684.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2-9de3bb.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2-9de3bb.json
deleted file mode 100644
index 0fe129ff8e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2-9de3bb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9de3bb03-9dd4-4b5a-a2ac-20e02c951355",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-9de3bb03-9dd4-4b5a-a2ac-20e02c951355.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4953",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F2F7:BFBF46:5D74AC9D"
-    }
-  },
-  "uuid": "9de3bb03-9dd4-4b5a-a2ac-20e02c951355",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..a3bf4696d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "9de3bb03-9dd4-4b5a-a2ac-20e02c951355",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F2F7:BFBF46:5D74AC9D"
+    }
+  },
+  "uuid": "9de3bb03-9dd4-4b5a-a2ac-20e02c951355",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3-f81e50.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3-f81e50.json
deleted file mode 100644
index 9dec187434..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3-f81e50.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "f81e5019-7e7f-48df-803a-d47defd3f22d",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-f81e5019-7e7f-48df-803a-d47defd3f22d.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4952",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dd8239fd64940b7b3ae7153454774220\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F30A:BFBF5B:5D74AC9E"
-    }
-  },
-  "uuid": "f81e5019-7e7f-48df-803a-d47defd3f22d",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..17d6fb803a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "f81e5019-7e7f-48df-803a-d47defd3f22d",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4952",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dd8239fd64940b7b3ae7153454774220\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F30A:BFBF5B:5D74AC9E"
+    }
+  },
+  "uuid": "f81e5019-7e7f-48df-803a-d47defd3f22d",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7-684ed3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7-684ed3.json
deleted file mode 100644
index 10b39ee21b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7-684ed3.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "684ed3a1-dca4-42f3-b25a-ebea733d4a02",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-684ed3a1-dca4-42f3-b25a-ebea733d4a02.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"195f97272e555453610aa257d5fb5b9a\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F3D8:BFC036:5D74ACA0"
-    }
-  },
-  "uuid": "684ed3a1-dca4-42f3-b25a-ebea733d4a02",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..b9fc07ddd8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "684ed3a1-dca4-42f3-b25a-ebea733d4a02",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4948",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"195f97272e555453610aa257d5fb5b9a\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F3D8:BFC036:5D74ACA0"
+    }
+  },
+  "uuid": "684ed3a1-dca4-42f3-b25a-ebea733d4a02",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-a2c01b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-a2c01b.json
deleted file mode 100644
index 7301673316..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-a2c01b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "a2c01b93-3f63-418c-bd0b-a5a61b96999f",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsQualifiedHead_stable\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-a2c01b93-3f63-418c-bd0b-a5a61b96999f.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"200d053663da19ab9669ae71ba616fa9\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/259",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F322:BFBF73:5D74AC9E"
-    }
-  },
-  "uuid": "a2c01b93-3f63-418c-bd0b-a5a61b96999f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..8c50f5e00b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "a2c01b93-3f63-418c-bd0b-a5a61b96999f",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsQualifiedHead_stable\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"200d053663da19ab9669ae71ba616fa9\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/259",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F322:BFBF73:5D74AC9E"
+    }
+  },
+  "uuid": "a2c01b93-3f63-418c-bd0b-a5a61b96999f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-9afc3a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-9afc3a.json
deleted file mode 100644
index 6d36e67a2d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-9afc3a.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "9afc3aa9-ac54-4c53-b5e3-3c0793558359",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/rc\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsQualifiedHead_rc\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-9afc3aa9-ac54-4c53-b5e3-3c0793558359.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"a36f2b49526944ef83755f5a7c70a604\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/260",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F361:BFBFB7:5D74AC9F"
-    }
-  },
-  "uuid": "9afc3aa9-ac54-4c53-b5e3-3c0793558359",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json
new file mode 100644
index 0000000000..8094b42908
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "9afc3aa9-ac54-4c53-b5e3-3c0793558359",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/rc\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsQualifiedHead_rc\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"a36f2b49526944ef83755f5a7c70a604\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/260",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F361:BFBFB7:5D74AC9F"
+    }
+  },
+  "uuid": "9afc3aa9-ac54-4c53-b5e3-3c0793558359",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-ab7461.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-ab7461.json
deleted file mode 100644
index ca30835a00..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-ab7461.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ab74613d-0613-47a8-a6fc-34add77d9967",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open&head=github-api-test-org%3Atest%2Fstable&base=master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-ab74613d-0613-47a8-a6fc-34add77d9967.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"eabad54ec37a46eaa61190e8372ad147\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F3C1:BFC015:5D74ACA0"
-    }
-  },
-  "uuid": "ab74613d-0613-47a8-a6fc-34add77d9967",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json
new file mode 100644
index 0000000000..1e739e3448
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json
@@ -0,0 +1,47 @@
+{
+  "id": "ab74613d-0613-47a8-a6fc-34add77d9967",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open&head=github-api-test-org%3Atest%2Fstable&base=master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"eabad54ec37a46eaa61190e8372ad147\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F3C1:BFC015:5D74ACA0"
+    }
+  },
+  "uuid": "ab74613d-0613-47a8-a6fc-34add77d9967",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-4e73cd.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-4e73cd.json
deleted file mode 100644
index 1eceff3d34..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-4e73cd.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "4e73cd50-9986-426e-bf13-b7ad18f36be0",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4e73cd50-9986-426e-bf13-b7ad18f36be0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"19efb7691278d0c8f8c7d905df960345\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F3E9:BFC049:5D74ACA0"
-    }
-  },
-  "uuid": "4e73cd50-9986-426e-bf13-b7ad18f36be0",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json
new file mode 100644
index 0000000000..85b4076f3d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json
@@ -0,0 +1,47 @@
+{
+  "id": "4e73cd50-9986-426e-bf13-b7ad18f36be0",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4947",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"19efb7691278d0c8f8c7d905df960345\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F3E9:BFC049:5D74ACA0"
+    }
+  },
+  "uuid": "4e73cd50-9986-426e-bf13-b7ad18f36be0",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10-5f1852.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10-5f1852.json
deleted file mode 100644
index 7d6410a02d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10-5f1852.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "5f1852a8-2f93-46f0-a692-538bb386c436",
-  "name": "repos_github-api-test-org_github-api_pulls_259",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/259",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_259-5f1852a8-2f93-46f0-a692-538bb386c436.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4945",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2309da07084fba85129298a8e2214bce\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F423:BFC084:5D74ACA1"
-    }
-  },
-  "uuid": "5f1852a8-2f93-46f0-a692-538bb386c436",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10.json
new file mode 100644
index 0000000000..6b2f378c99
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_259-10.json
@@ -0,0 +1,54 @@
+{
+  "id": "5f1852a8-2f93-46f0-a692-538bb386c436",
+  "name": "repos_github-api-test-org_github-api_pulls_259",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/259",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_259-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4945",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2309da07084fba85129298a8e2214bce\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F423:BFC084:5D74ACA1"
+    }
+  },
+  "uuid": "5f1852a8-2f93-46f0-a692-538bb386c436",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9-6162e3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9-6162e3.json
deleted file mode 100644
index ba800172cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9-6162e3.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "6162e3a9-487d-475a-a4e1-f037c796baf5",
-  "name": "repos_github-api-test-org_github-api_pulls_260",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/260",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_260-6162e3a9-487d-475a-a4e1-f037c796baf5.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f86a3bd8b1787cf9c3f673c69e2456c1\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F3FA:BFC05B:5D74ACA0"
-    }
-  },
-  "uuid": "6162e3a9-487d-475a-a4e1-f037c796baf5",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9.json
new file mode 100644
index 0000000000..e69f278f5f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_260-9.json
@@ -0,0 +1,54 @@
+{
+  "id": "6162e3a9-487d-475a-a4e1-f037c796baf5",
+  "name": "repos_github-api-test-org_github-api_pulls_260",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/260",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_260-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f86a3bd8b1787cf9c3f673c69e2456c1\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F3FA:BFC05B:5D74ACA0"
+    }
+  },
+  "uuid": "6162e3a9-487d-475a-a4e1-f037c796baf5",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1-4966fe.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1-4966fe.json
deleted file mode 100644
index e5d862d4cb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1-4966fe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4966fe2a-d81e-4b83-acd4-b1c3e2f4f684",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-4966fe2a-d81e-4b83-acd4-b1c3e2f4f684.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7B:0A32:A2F2ED:BFBF37:5D74AC9D"
-    }
-  },
-  "uuid": "4966fe2a-d81e-4b83-acd4-b1c3e2f4f684",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1.json
new file mode 100644
index 0000000000..07e057a98c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsQualifiedHead/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "4966fe2a-d81e-4b83-acd4-b1c3e2f4f684",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7B:0A32:A2F2ED:BFBF37:5D74AC9D"
+    }
+  },
+  "uuid": "4966fe2a-d81e-4b83-acd4-b1c3e2f4f684",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/orgs_github-api-test-org-80e70ac1-7d85-4431-a004-1c16dd3def5c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/orgs_github-api-test-org-80e70ac1-7d85-4431-a004-1c16dd3def5c.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-10e587d7-cc44-4965-a559-261991a6a1d7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-10e587d7-cc44-4965-a559-261991a6a1d7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-db8422da-0a10-42a5-94f4-3c694b2baaf0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-db8422da-0a10-42a5-94f4-3c694b2baaf0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-cc03923a-acb0-4c40-ae5a-3d7a9b406ce3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-cc03923a-acb0-4c40-ae5a-3d7a9b406ce3.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-37334410-0027-4784-b4d5-4a1e4b6e3174.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-37334410-0027-4784-b4d5-4a1e4b6e3174.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-3d58d4ba-d752-421e-acdc-6fea50e3311a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-3d58d4ba-d752-421e-acdc-6fea50e3311a.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-cfa90ef7-9496-4f77-b239-adf88ad5dd64.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-cfa90ef7-9496-4f77-b239-adf88ad5dd64.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_268-08817e59-cbfd-4e89-9e60-707e4ee940e6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_268-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_268-08817e59-cbfd-4e89-9e60-707e4ee940e6.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_268-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_269-b5427c9e-53f5-4301-a757-4c9a349ee97d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_269-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_269-b5427c9e-53f5-4301-a757-4c9a349ee97d.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/repos_github-api-test-org_github-api_pulls_269-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/user-69a2a995-8642-477e-aafe-59a7869f4ae9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/user-69a2a995-8642-477e-aafe-59a7869f4ae9.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2-80e70a.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2-80e70a.json
deleted file mode 100644
index 8ae516ecc6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2-80e70a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "80e70ac1-7d85-4431-a004-1c16dd3def5c",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-80e70ac1-7d85-4431-a004-1c16dd3def5c.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4858",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D306F4:F66E77:5D74ACC7"
-    }
-  },
-  "uuid": "80e70ac1-7d85-4431-a004-1c16dd3def5c",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..261e613781
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "80e70ac1-7d85-4431-a004-1c16dd3def5c",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4858",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D306F4:F66E77:5D74ACC7"
+    }
+  },
+  "uuid": "80e70ac1-7d85-4431-a004-1c16dd3def5c",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3-10e587.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3-10e587.json
deleted file mode 100644
index d69fb1dfee..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3-10e587.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "10e587d7-cc44-4965-a559-261991a6a1d7",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-10e587d7-cc44-4965-a559-261991a6a1d7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4857",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"17b3b848c656ff5666591ae88958ffa7\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D30704:F66E89:5D74ACC7"
-    }
-  },
-  "uuid": "10e587d7-cc44-4965-a559-261991a6a1d7",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..dc573ddf17
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "10e587d7-cc44-4965-a559-261991a6a1d7",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4857",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"17b3b848c656ff5666591ae88958ffa7\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D30704:F66E89:5D74ACC7"
+    }
+  },
+  "uuid": "10e587d7-cc44-4965-a559-261991a6a1d7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7-db8422.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7-db8422.json
deleted file mode 100644
index 854a18794e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7-db8422.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "db8422da-0a10-42a5-94f4-3c694b2baaf0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-db8422da-0a10-42a5-94f4-3c694b2baaf0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4853",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ab67447ee4109501e0b55705cb0b9d80\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D307CF:F66F69:5D74ACC9"
-    }
-  },
-  "uuid": "db8422da-0a10-42a5-94f4-3c694b2baaf0",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..36f7be7d7a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "db8422da-0a10-42a5-94f4-3c694b2baaf0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4853",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ab67447ee4109501e0b55705cb0b9d80\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D307CF:F66F69:5D74ACC9"
+    }
+  },
+  "uuid": "db8422da-0a10-42a5-94f4-3c694b2baaf0",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-cc0392.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-cc0392.json
deleted file mode 100644
index 57853391f5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4-cc0392.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "cc03923a-acb0-4c40-ae5a-3d7a9b406ce3",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsUnqualifiedHead_stable\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-cc03923a-acb0-4c40-ae5a-3d7a9b406ce3.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4856",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"9e34ae02c80a426ed34b857b713bfb30\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/268",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D30712:F66E9E:5D74ACC7"
-    }
-  },
-  "uuid": "cc03923a-acb0-4c40-ae5a-3d7a9b406ce3",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..414eddf090
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "cc03923a-acb0-4c40-ae5a-3d7a9b406ce3",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsUnqualifiedHead_stable\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4856",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"9e34ae02c80a426ed34b857b713bfb30\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/268",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D30712:F66E9E:5D74ACC7"
+    }
+  },
+  "uuid": "cc03923a-acb0-4c40-ae5a-3d7a9b406ce3",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-373344.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-373344.json
deleted file mode 100644
index c2b2f4aea2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5-373344.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "37334410-0027-4784-b4d5-4a1e4b6e3174",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/rc\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsUnqualifiedHead_rc\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-37334410-0027-4784-b4d5-4a1e4b6e3174.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4855",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"e6bcc8ce97d56e22bf1aab9b388e3a68\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/269",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D30765:F66EF8:5D74ACC8"
-    }
-  },
-  "uuid": "37334410-0027-4784-b4d5-4a1e4b6e3174",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json
new file mode 100644
index 0000000000..eee20512b1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "37334410-0027-4784-b4d5-4a1e4b6e3174",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/rc\",\"maintainer_can_modify\":true,\"title\":\"queryPullRequestsUnqualifiedHead_rc\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4855",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"e6bcc8ce97d56e22bf1aab9b388e3a68\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/269",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D30765:F66EF8:5D74ACC8"
+    }
+  },
+  "uuid": "37334410-0027-4784-b4d5-4a1e4b6e3174",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-3d58d4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-3d58d4.json
deleted file mode 100644
index b25bea48f2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6-3d58d4.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "3d58d4ba-d752-421e-acdc-6fea50e3311a",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open&head=github-api-test-org%3Atest%2Fstable&base=master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-3d58d4ba-d752-421e-acdc-6fea50e3311a.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4854",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bca0c7921914918337495cf2c4997c21\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D307A9:F66F48:5D74ACC9"
-    }
-  },
-  "uuid": "3d58d4ba-d752-421e-acdc-6fea50e3311a",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json
new file mode 100644
index 0000000000..2d5aab57ff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-6.json
@@ -0,0 +1,47 @@
+{
+  "id": "3d58d4ba-d752-421e-acdc-6fea50e3311a",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open&head=github-api-test-org%3Atest%2Fstable&base=master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4854",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bca0c7921914918337495cf2c4997c21\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D307A9:F66F48:5D74ACC9"
+    }
+  },
+  "uuid": "3d58d4ba-d752-421e-acdc-6fea50e3311a",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-cfa90e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-cfa90e.json
deleted file mode 100644
index 052499a55e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8-cfa90e.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "cfa90ef7-9496-4f77-b239-adf88ad5dd64",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-cfa90ef7-9496-4f77-b239-adf88ad5dd64.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4852",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f937ef67c4c56d9ae1f03ae5ba1e403a\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D307F9:F66F9A:5D74ACC9"
-    }
-  },
-  "uuid": "cfa90ef7-9496-4f77-b239-adf88ad5dd64",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json
new file mode 100644
index 0000000000..d11f2e34ec
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls-8.json
@@ -0,0 +1,47 @@
+{
+  "id": "cfa90ef7-9496-4f77-b239-adf88ad5dd64",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4852",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f937ef67c4c56d9ae1f03ae5ba1e403a\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D307F9:F66F9A:5D74ACC9"
+    }
+  },
+  "uuid": "cfa90ef7-9496-4f77-b239-adf88ad5dd64",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9-08817e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9-08817e.json
deleted file mode 100644
index edbb6a9627..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9-08817e.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "08817e59-cbfd-4e89-9e60-707e4ee940e6",
-  "name": "repos_github-api-test-org_github-api_pulls_268",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/268",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_268-08817e59-cbfd-4e89-9e60-707e4ee940e6.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4851",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"049e282f4491dd6ff498e76ae345eacd\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D30808:F66FBE:5D74ACCA"
-    }
-  },
-  "uuid": "08817e59-cbfd-4e89-9e60-707e4ee940e6",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9.json
new file mode 100644
index 0000000000..b61eba7a5c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_268-9.json
@@ -0,0 +1,54 @@
+{
+  "id": "08817e59-cbfd-4e89-9e60-707e4ee940e6",
+  "name": "repos_github-api-test-org_github-api_pulls_268",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/268",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_268-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4851",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"049e282f4491dd6ff498e76ae345eacd\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D30808:F66FBE:5D74ACCA"
+    }
+  },
+  "uuid": "08817e59-cbfd-4e89-9e60-707e4ee940e6",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10-b5427c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10-b5427c.json
deleted file mode 100644
index 3150f3366c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10-b5427c.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "b5427c9e-53f5-4301-a757-4c9a349ee97d",
-  "name": "repos_github-api-test-org_github-api_pulls_269",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/269",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_269-b5427c9e-53f5-4301-a757-4c9a349ee97d.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4850",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c74d62cfa43b79092c075a2a83e725e6\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D30839:F66FF0:5D74ACCA"
-    }
-  },
-  "uuid": "b5427c9e-53f5-4301-a757-4c9a349ee97d",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10.json
new file mode 100644
index 0000000000..3370ccd6fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/repos_github-api-test-org_github-api_pulls_269-10.json
@@ -0,0 +1,54 @@
+{
+  "id": "b5427c9e-53f5-4301-a757-4c9a349ee97d",
+  "name": "repos_github-api-test-org_github-api_pulls_269",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/269",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_269-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4850",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c74d62cfa43b79092c075a2a83e725e6\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D30839:F66FF0:5D74ACCA"
+    }
+  },
+  "uuid": "b5427c9e-53f5-4301-a757-4c9a349ee97d",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1-69a2a9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1-69a2a9.json
deleted file mode 100644
index a60048d10a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1-69a2a9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "69a2a995-8642-477e-aafe-59a7869f4ae9",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-69a2a995-8642-477e-aafe-59a7869f4ae9.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4859",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF97:15CE:D306E9:F66E67:5D74ACC6"
-    }
-  },
-  "uuid": "69a2a995-8642-477e-aafe-59a7869f4ae9",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1.json
new file mode 100644
index 0000000000..0f3e127859
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/queryPullRequestsUnqualifiedHead/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "69a2a995-8642-477e-aafe-59a7869f4ae9",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4859",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF97:15CE:D306E9:F66E67:5D74ACC6"
+    }
+  },
+  "uuid": "69a2a995-8642-477e-aafe-59a7869f4ae9",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/orgs_github-api-test-org-41c140fe-0c07-406f-8a11-c8c4dad3ff91.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/orgs_github-api-test-org-41c140fe-0c07-406f-8a11-c8c4dad3ff91.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-f25bc1c4-0789-481f-bedf-b02bb58709b7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-f25bc1c4-0789-481f-bedf-b02bb58709b7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-6415bdcd-1b83-46fb-99b8-1e93bb21ecc4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-6415bdcd-1b83-46fb-99b8-1e93bb21ecc4.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-d2df6fea-d463-4b4e-ac13-024bf488bfcf.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-d2df6fea-d463-4b4e-ac13-024bf488bfcf.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_issues_271-9171d903-c9bb-400b-b09f-a95f1f7d9c03.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_issues_271-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_issues_271-9171d903-c9bb-400b-b09f-a95f1f7d9c03.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_issues_271-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-8c712317-17a5-4e10-9463-61ef2564a0b7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-8c712317-17a5-4e10-9463-61ef2564a0b7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-aee9a7ec-9886-48b9-b8bc-f57480b183ab.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-aee9a7ec-9886-48b9-b8bc-f57480b183ab.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-ff9fa198-2c33-4554-826e-5a2ec150d1c9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-ff9fa198-2c33-4554-826e-5a2ec150d1c9.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-844a4111-bda7-4086-affc-96fa7cf053d0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-844a4111-bda7-4086-affc-96fa7cf053d0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/repos_github-api-test-org_github-api_pulls_271-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/user-27e10619-a669-4ec6-8270-519114eef6f6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/user-27e10619-a669-4ec6-8270-519114eef6f6.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2-41c140.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2-41c140.json
deleted file mode 100644
index ff69990be9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2-41c140.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "41c140fe-0c07-406f-8a11-c8c4dad3ff91",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-41c140fe-0c07-406f-8a11-c8c4dad3ff91.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4840",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C99500:EB500E:5D74ACCF"
-    }
-  },
-  "uuid": "41c140fe-0c07-406f-8a11-c8c4dad3ff91",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..7f03c23234
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "41c140fe-0c07-406f-8a11-c8c4dad3ff91",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4840",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C99500:EB500E:5D74ACCF"
+    }
+  },
+  "uuid": "41c140fe-0c07-406f-8a11-c8c4dad3ff91",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3-f25bc1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3-f25bc1.json
deleted file mode 100644
index 00b176c920..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3-f25bc1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "f25bc1c4-0789-481f-bedf-b02bb58709b7",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-f25bc1c4-0789-481f-bedf-b02bb58709b7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4839",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5bd22dcf2a91e6f4e9b81d328d6c3992\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C99516:EB502A:5D74ACCF"
-    }
-  },
-  "uuid": "f25bc1c4-0789-481f-bedf-b02bb58709b7",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..1552081823
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "f25bc1c4-0789-481f-bedf-b02bb58709b7",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4839",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5bd22dcf2a91e6f4e9b81d328d6c3992\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C99516:EB502A:5D74ACCF"
+    }
+  },
+  "uuid": "f25bc1c4-0789-481f-bedf-b02bb58709b7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6-6415bd.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6-6415bd.json
deleted file mode 100644
index c8f539dc67..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6-6415bd.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "6415bdcd-1b83-46fb-99b8-1e93bb21ecc4",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6415bdcd-1b83-46fb-99b8-1e93bb21ecc4.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4836",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1ed427629429ded9373deae90c0f49b2\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C9961C:EB5152:5D74ACD1"
-    }
-  },
-  "uuid": "6415bdcd-1b83-46fb-99b8-1e93bb21ecc4",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..fa5627d80c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "6415bdcd-1b83-46fb-99b8-1e93bb21ecc4",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4836",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1ed427629429ded9373deae90c0f49b2\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C9961C:EB5152:5D74ACD1"
+    }
+  },
+  "uuid": "6415bdcd-1b83-46fb-99b8-1e93bb21ecc4",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8-d2df6f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8-d2df6f.json
deleted file mode 100644
index 185ea87e28..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8-d2df6f.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "d2df6fea-d463-4b4e-ac13-024bf488bfcf",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-d2df6fea-d463-4b4e-ac13-024bf488bfcf.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4834",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1ed427629429ded9373deae90c0f49b2\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C99673:EB51A9:5D74ACD1"
-    }
-  },
-  "uuid": "d2df6fea-d463-4b4e-ac13-024bf488bfcf",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8.json
new file mode 100644
index 0000000000..e3d68b5694
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api-8.json
@@ -0,0 +1,50 @@
+{
+  "id": "d2df6fea-d463-4b4e-ac13-024bf488bfcf",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4834",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1ed427629429ded9373deae90c0f49b2\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C99673:EB51A9:5D74ACD1"
+    }
+  },
+  "uuid": "d2df6fea-d463-4b4e-ac13-024bf488bfcf",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5-9171d9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5-9171d9.json
deleted file mode 100644
index 76f57f17df..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5-9171d9.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "9171d903-c9bb-400b-b09f-a95f1f7d9c03",
-  "name": "repos_github-api-test-org_github-api_issues_271",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/271",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"assignees\":[\"bitwiseman\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_271-9171d903-c9bb-400b-b09f-a95f1f7d9c03.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4837",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5d0c81990a41d7d8ce9f498c6ba14b4b\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C995DE:EB50EE:5D74ACD0"
-    }
-  },
-  "uuid": "9171d903-c9bb-400b-b09f-a95f1f7d9c03",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5.json
new file mode 100644
index 0000000000..a9c4a4c8de
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_issues_271-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "9171d903-c9bb-400b-b09f-a95f1f7d9c03",
+  "name": "repos_github-api-test-org_github-api_issues_271",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/271",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"assignees\":[\"bitwiseman\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_271-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4837",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5d0c81990a41d7d8ce9f498c6ba14b4b\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C995DE:EB50EE:5D74ACD0"
+    }
+  },
+  "uuid": "9171d903-c9bb-400b-b09f-a95f1f7d9c03",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4-8c7123.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4-8c7123.json
deleted file mode 100644
index 922b4a9526..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4-8c7123.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "8c712317-17a5-4e10-9463-61ef2564a0b7",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"setAssignee\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-8c712317-17a5-4e10-9463-61ef2564a0b7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4838",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"82fbe7dd1f604b8a2285179b69bd96f5\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/271",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C99546:EB5066:5D74ACCF"
-    }
-  },
-  "uuid": "8c712317-17a5-4e10-9463-61ef2564a0b7",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..ea445ee6eb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "8c712317-17a5-4e10-9463-61ef2564a0b7",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"setAssignee\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4838",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"82fbe7dd1f604b8a2285179b69bd96f5\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/271",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C99546:EB5066:5D74ACCF"
+    }
+  },
+  "uuid": "8c712317-17a5-4e10-9463-61ef2564a0b7",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9-aee9a7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9-aee9a7.json
deleted file mode 100644
index 6782f1a7aa..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9-aee9a7.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "aee9a7ec-9886-48b9-b8bc-f57480b183ab",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-aee9a7ec-9886-48b9-b8bc-f57480b183ab.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4833",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f8b61bc4cc6f87ff477e17e820da30c2\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C996A6:EB51CF:5D74ACD1"
-    }
-  },
-  "uuid": "aee9a7ec-9886-48b9-b8bc-f57480b183ab",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9.json
new file mode 100644
index 0000000000..1a98a75073
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls-9.json
@@ -0,0 +1,47 @@
+{
+  "id": "aee9a7ec-9886-48b9-b8bc-f57480b183ab",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4833",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f8b61bc4cc6f87ff477e17e820da30c2\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C996A6:EB51CF:5D74ACD1"
+    }
+  },
+  "uuid": "aee9a7ec-9886-48b9-b8bc-f57480b183ab",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10-ff9fa1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10-ff9fa1.json
deleted file mode 100644
index a549bb8b56..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10-ff9fa1.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "ff9fa198-2c33-4554-826e-5a2ec150d1c9",
-  "name": "repos_github-api-test-org_github-api_pulls_271",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/271",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_271-ff9fa198-2c33-4554-826e-5a2ec150d1c9.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4832",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"51caf19019a931068e720631831616ce\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C996C5:EB5211:5D74ACD2"
-    }
-  },
-  "uuid": "ff9fa198-2c33-4554-826e-5a2ec150d1c9",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10.json
new file mode 100644
index 0000000000..5636f4ef1a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-10.json
@@ -0,0 +1,54 @@
+{
+  "id": "ff9fa198-2c33-4554-826e-5a2ec150d1c9",
+  "name": "repos_github-api-test-org_github-api_pulls_271",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/271",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_271-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4832",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"51caf19019a931068e720631831616ce\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C996C5:EB5211:5D74ACD2"
+    }
+  },
+  "uuid": "ff9fa198-2c33-4554-826e-5a2ec150d1c9",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7-844a41.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7-844a41.json
deleted file mode 100644
index 670b023f58..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7-844a41.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "844a4111-bda7-4086-affc-96fa7cf053d0",
-  "name": "repos_github-api-test-org_github-api_pulls_271",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/271",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_271-844a4111-bda7-4086-affc-96fa7cf053d0.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4835",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b27512dbea32f30d46a33e60cb872907\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:25:04 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C9963E:EB5179:5D74ACD1"
-    }
-  },
-  "uuid": "844a4111-bda7-4086-affc-96fa7cf053d0",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7.json
new file mode 100644
index 0000000000..6995c3cc7d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/repos_github-api-test-org_github-api_pulls_271-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "844a4111-bda7-4086-affc-96fa7cf053d0",
+  "name": "repos_github-api-test-org_github-api_pulls_271",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/271",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_271-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4835",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b27512dbea32f30d46a33e60cb872907\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:25:04 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C9963E:EB5179:5D74ACD1"
+    }
+  },
+  "uuid": "844a4111-bda7-4086-affc-96fa7cf053d0",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1-27e106.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1-27e106.json
deleted file mode 100644
index 45ca8e5008..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1-27e106.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "27e10619-a669-4ec6-8270-519114eef6f6",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-27e10619-a669-4ec6-8270-519114eef6f6.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:25:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4841",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF9F:80B3:C994DF:EB4FEB:5D74ACCF"
-    }
-  },
-  "uuid": "27e10619-a669-4ec6-8270-519114eef6f6",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1.json
new file mode 100644
index 0000000000..dd5caaeca8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setAssignee/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "27e10619-a669-4ec6-8270-519114eef6f6",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:25:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4841",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF9F:80B3:C994DF:EB4FEB:5D74ACCF"
+    }
+  },
+  "uuid": "27e10619-a669-4ec6-8270-519114eef6f6",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/orgs_github-api-test-org-04e11278-2441-4a15-9491-102d5e142409.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/orgs_github-api-test-org-04e11278-2441-4a15-9491-102d5e142409.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-1b1c6847-2cda-47ec-a736-79672a3a7abe.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-1b1c6847-2cda-47ec-a736-79672a3a7abe.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-4e2383e2-109f-4ba8-910a-e6fa057728fe.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-4e2383e2-109f-4ba8-910a-e6fa057728fe.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-caba7863-7e0a-48ed-b54d-e6121b595280.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-caba7863-7e0a-48ed-b54d-e6121b595280.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-1421d6dd-ddf5-44ca-a50e-03848f69af20.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-1421d6dd-ddf5-44ca-a50e-03848f69af20.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-52c0826c-b7a4-47a7-a202-505128247a5e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-52c0826c-b7a4-47a7-a202-505128247a5e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_issues_264-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-bd497d3d-3712-4ea7-9e01-2810bf2b83c8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-bd497d3d-3712-4ea7-9e01-2810bf2b83c8.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-7af49b84-1732-4a74-b123-676769146f83.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-7af49b84-1732-4a74-b123-676769146f83.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-4627827c-55fb-4f0c-850d-23fd6b35b4f7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-4627827c-55fb-4f0c-850d-23fd6b35b4f7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/repos_github-api-test-org_github-api_pulls_264-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/user-946afcfe-31ac-4f28-9d66-5f45ffbb3a7c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/user-946afcfe-31ac-4f28-9d66-5f45ffbb3a7c.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2-04e112.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2-04e112.json
deleted file mode 100644
index 96be6a3ced..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2-04e112.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "04e11278-2441-4a15-9491-102d5e142409",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-04e11278-2441-4a15-9491-102d5e142409.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD3D1:586783:5D74ACB1"
-    }
-  },
-  "uuid": "04e11278-2441-4a15-9491-102d5e142409",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..7742597af8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "04e11278-2441-4a15-9491-102d5e142409",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD3D1:586783:5D74ACB1"
+    }
+  },
+  "uuid": "04e11278-2441-4a15-9491-102d5e142409",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3-1b1c68.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3-1b1c68.json
deleted file mode 100644
index ab804c48de..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3-1b1c68.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1b1c6847-2cda-47ec-a736-79672a3a7abe",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1b1c6847-2cda-47ec-a736-79672a3a7abe.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"63f427b5bc81943feca4792461202c49\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD3DA:58678D:5D74ACB1"
-    }
-  },
-  "uuid": "1b1c6847-2cda-47ec-a736-79672a3a7abe",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..a805ec6a14
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "1b1c6847-2cda-47ec-a736-79672a3a7abe",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4907",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"63f427b5bc81943feca4792461202c49\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD3DA:58678D:5D74ACB1"
+    }
+  },
+  "uuid": "1b1c6847-2cda-47ec-a736-79672a3a7abe",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6-4e2383.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6-4e2383.json
deleted file mode 100644
index 6fd041e2fe..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6-4e2383.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4e2383e2-109f-4ba8-910a-e6fa057728fe",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-4e2383e2-109f-4ba8-910a-e6fa057728fe.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4904",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4f1fa06be9bf4b185661c257f4361c24\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD413:5867CB:5D74ACB3"
-    }
-  },
-  "uuid": "4e2383e2-109f-4ba8-910a-e6fa057728fe",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..dfeef00c83
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "4e2383e2-109f-4ba8-910a-e6fa057728fe",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4904",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4f1fa06be9bf4b185661c257f4361c24\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD413:5867CB:5D74ACB3"
+    }
+  },
+  "uuid": "4e2383e2-109f-4ba8-910a-e6fa057728fe",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9-caba78.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9-caba78.json
deleted file mode 100644
index 1f9497b770..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9-caba78.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "caba7863-7e0a-48ed-b54d-e6121b595280",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-caba7863-7e0a-48ed-b54d-e6121b595280.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4901",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4f1fa06be9bf4b185661c257f4361c24\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD437:5867F5:5D74ACB4"
-    }
-  },
-  "uuid": "caba7863-7e0a-48ed-b54d-e6121b595280",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9.json
new file mode 100644
index 0000000000..c42fec71aa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api-9.json
@@ -0,0 +1,50 @@
+{
+  "id": "caba7863-7e0a-48ed-b54d-e6121b595280",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4901",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4f1fa06be9bf4b185661c257f4361c24\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD437:5867F5:5D74ACB4"
+    }
+  },
+  "uuid": "caba7863-7e0a-48ed-b54d-e6121b595280",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5-52c082.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5-52c082.json
deleted file mode 100644
index 9af519d32b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5-52c082.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "52c0826c-b7a4-47a7-a202-505128247a5e",
-  "name": "repos_github-api-test-org_github-api_issues_264",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/264",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"labels\":[\"setLabels_label_name\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_264-52c0826c-b7a4-47a7-a202-505128247a5e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4905",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d3cd42d3a7bdf3d2c3a2b4a08bf23ce5\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD404:5867BB:5D74ACB2"
-    }
-  },
-  "uuid": "52c0826c-b7a4-47a7-a202-505128247a5e",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5.json
new file mode 100644
index 0000000000..5bed339ad8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "52c0826c-b7a4-47a7-a202-505128247a5e",
+  "name": "repos_github-api-test-org_github-api_issues_264",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/264",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"labels\":[\"setLabels_label_name\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_264-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4905",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d3cd42d3a7bdf3d2c3a2b4a08bf23ce5\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD404:5867BB:5D74ACB2"
+    }
+  },
+  "uuid": "52c0826c-b7a4-47a7-a202-505128247a5e",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8-1421d6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8-1421d6.json
deleted file mode 100644
index ec5aea2266..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8-1421d6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1421d6dd-ddf5-44ca-a50e-03848f69af20",
-  "name": "repos_github-api-test-org_github-api_issues_264",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/issues/264",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_issues_264-1421d6dd-ddf5-44ca-a50e-03848f69af20.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4902",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d3cd42d3a7bdf3d2c3a2b4a08bf23ce5\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:35 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD434:5867F1:5D74ACB4"
-    }
-  },
-  "uuid": "1421d6dd-ddf5-44ca-a50e-03848f69af20",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8.json
new file mode 100644
index 0000000000..1d00880fc6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_issues_264-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "1421d6dd-ddf5-44ca-a50e-03848f69af20",
+  "name": "repos_github-api-test-org_github-api_issues_264",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/issues/264",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_issues_264-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4902",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d3cd42d3a7bdf3d2c3a2b4a08bf23ce5\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:35 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD434:5867F1:5D74ACB4"
+    }
+  },
+  "uuid": "1421d6dd-ddf5-44ca-a50e-03848f69af20",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10-bd497d.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10-bd497d.json
deleted file mode 100644
index 44f69fff1f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10-bd497d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "bd497d3d-3712-4ea7-9e01-2810bf2b83c8",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-bd497d3d-3712-4ea7-9e01-2810bf2b83c8.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf2cb7d3c66934d3bc296b9dc3d1c269\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD43D:5867FB:5D74ACB4"
-    }
-  },
-  "uuid": "bd497d3d-3712-4ea7-9e01-2810bf2b83c8",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10.json
new file mode 100644
index 0000000000..b050365317
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-10.json
@@ -0,0 +1,47 @@
+{
+  "id": "bd497d3d-3712-4ea7-9e01-2810bf2b83c8",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls?state=open",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4900",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf2cb7d3c66934d3bc296b9dc3d1c269\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD43D:5867FB:5D74ACB4"
+    }
+  },
+  "uuid": "bd497d3d-3712-4ea7-9e01-2810bf2b83c8",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4-7af49b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4-7af49b.json
deleted file mode 100644
index d68667a44b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4-7af49b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "7af49b84-1732-4a74-b123-676769146f83",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"setLabels\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-7af49b84-1732-4a74-b123-676769146f83.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:34 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4906",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"dce2e4378de06893e7bf5705f5da6c70\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/264",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD3E5:58679A:5D74ACB2"
-    }
-  },
-  "uuid": "7af49b84-1732-4a74-b123-676769146f83",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..f0bb000040
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "7af49b84-1732-4a74-b123-676769146f83",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"setLabels\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4906",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"dce2e4378de06893e7bf5705f5da6c70\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/264",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD3E5:58679A:5D74ACB2"
+    }
+  },
+  "uuid": "7af49b84-1732-4a74-b123-676769146f83",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11-cfd2cf.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11-cfd2cf.json
deleted file mode 100644
index 6c0d356221..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11-cfd2cf.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4",
-  "name": "repos_github-api-test-org_github-api_pulls_264",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/264",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"state\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_264-cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fa492d17864867ff70f0eda2ba2e7c93\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD444:586801:5D74ACB4"
-    }
-  },
-  "uuid": "cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11.json
new file mode 100644
index 0000000000..088418b804
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-11.json
@@ -0,0 +1,54 @@
+{
+  "id": "cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4",
+  "name": "repos_github-api-test-org_github-api_pulls_264",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/264",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"state\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_264-11.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4899",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fa492d17864867ff70f0eda2ba2e7c93\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD444:586801:5D74ACB4"
+    }
+  },
+  "uuid": "cfd2cf1d-d98d-4374-a0fe-4d80a217e9d4",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7-462782.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7-462782.json
deleted file mode 100644
index 6aa823eb19..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7-462782.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4627827c-55fb-4f0c-850d-23fd6b35b4f7",
-  "name": "repos_github-api-test-org_github-api_pulls_264",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/264",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_264-4627827c-55fb-4f0c-850d-23fd6b35b4f7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4903",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c720faab41efaae1e5c8573973fcf333\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:35 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD42B:5867E7:5D74ACB3"
-    }
-  },
-  "uuid": "4627827c-55fb-4f0c-850d-23fd6b35b4f7",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7.json
new file mode 100644
index 0000000000..44d095567d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/repos_github-api-test-org_github-api_pulls_264-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "4627827c-55fb-4f0c-850d-23fd6b35b4f7",
+  "name": "repos_github-api-test-org_github-api_pulls_264",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/264",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_264-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4903",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c720faab41efaae1e5c8573973fcf333\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:35 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD42B:5867E7:5D74ACB3"
+    }
+  },
+  "uuid": "4627827c-55fb-4f0c-850d-23fd6b35b4f7",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1-946afc.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1-946afc.json
deleted file mode 100644
index 20b1e624a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1-946afc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "946afcfe-31ac-4f28-9d66-5f45ffbb3a7c",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-946afcfe-31ac-4f28-9d66-5f45ffbb3a7c.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4909",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF88:40BB:4AD3CA:58677C:5D74ACB1"
-    }
-  },
-  "uuid": "946afcfe-31ac-4f28-9d66-5f45ffbb3a7c",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1.json
new file mode 100644
index 0000000000..fe0c423a70
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/setLabels/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "946afcfe-31ac-4f28-9d66-5f45ffbb3a7c",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4909",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF88:40BB:4AD3CA:58677C:5D74ACB1"
+    }
+  },
+  "uuid": "946afcfe-31ac-4f28-9d66-5f45ffbb3a7c",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/orgs_github-api-test-org-b35d6e1e-890c-4df6-9935-5c2394a76916.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/orgs_github-api-test-org-b35d6e1e-890c-4df6-9935-5c2394a76916.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-5f283241-c895-49c8-92a5-f578369b853b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-5f283241-c895-49c8-92a5-f578369b853b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-6395c5e1-f2ec-4642-923d-9aebee203afe.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-6395c5e1-f2ec-4642-923d-9aebee203afe.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-957364c8-87d8-4b0d-aad4-396ad3fed253.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-957364c8-87d8-4b0d-aad4-396ad3fed253.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-7331ed24-bb2d-46a6-a842-986f52a91a5e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-7331ed24-bb2d-46a6-a842-986f52a91a5e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_contents_squashmerge-04ae8436-0239-47f1-9e0a-4c2987ca1378.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_contents_squashmerge-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_contents_squashmerge-04ae8436-0239-47f1-9e0a-4c2987ca1378.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_contents_squashmerge-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs-9d910f89-f71e-441d-8781-cba77a54dd08.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs-9d910f89-f71e-441d-8781-cba77a54dd08.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-7bfa9315-c036-44af-bc3c-1e639325a8fe.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-7bfa9315-c036-44af-bc3c-1e639325a8fe.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_pulls-d149e4dc-e134-4376-8b93-ce784a868247.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_pulls-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_pulls-d149e4dc-e134-4376-8b93-ce784a868247.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/repos_github-api-test-org_github-api_pulls-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/user-b37e46bb-87be-4613-88c7-dcba8c693074.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/user-b37e46bb-87be-4613-88c7-dcba8c693074.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2-b35d6e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2-b35d6e.json
deleted file mode 100644
index 45d7c51c7f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2-b35d6e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b35d6e1e-890c-4df6-9935-5c2394a76916",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b35d6e1e-890c-4df6-9935-5c2394a76916.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4871",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886A8:76EF44:5D74ACBF"
-    }
-  },
-  "uuid": "b35d6e1e-890c-4df6-9935-5c2394a76916",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..f4ba852464
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b35d6e1e-890c-4df6-9935-5c2394a76916",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4871",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886A8:76EF44:5D74ACBF"
+    }
+  },
+  "uuid": "b35d6e1e-890c-4df6-9935-5c2394a76916",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12-5f2832.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12-5f2832.json
deleted file mode 100644
index 96ae3d529d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12-5f2832.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "5f283241-c895-49c8-92a5-f578369b853b",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-5f283241-c895-49c8-92a5-f578369b853b.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4861",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"17b3b848c656ff5666591ae88958ffa7\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:688802:76F0CB:5D74ACC6"
-    }
-  },
-  "uuid": "5f283241-c895-49c8-92a5-f578369b853b",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12.json
new file mode 100644
index 0000000000..4b56759b0c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-12.json
@@ -0,0 +1,50 @@
+{
+  "id": "5f283241-c895-49c8-92a5-f578369b853b",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-12.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4861",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"17b3b848c656ff5666591ae88958ffa7\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:688802:76F0CB:5D74ACC6"
+    }
+  },
+  "uuid": "5f283241-c895-49c8-92a5-f578369b853b",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3-957364.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3-957364.json
deleted file mode 100644
index 6c3c8ebb98..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3-957364.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "957364c8-87d8-4b0d-aad4-396ad3fed253",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-957364c8-87d8-4b0d-aad4-396ad3fed253.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4870",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"05b645fd998415b5b1e1265dd27dbf29\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886B0:76EF4D:5D74ACBF"
-    }
-  },
-  "uuid": "957364c8-87d8-4b0d-aad4-396ad3fed253",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..83d0757023
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "957364c8-87d8-4b0d-aad4-396ad3fed253",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4870",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"05b645fd998415b5b1e1265dd27dbf29\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886B0:76EF4D:5D74ACBF"
+    }
+  },
+  "uuid": "957364c8-87d8-4b0d-aad4-396ad3fed253",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5-6395c5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5-6395c5.json
deleted file mode 100644
index 57487ba7bc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5-6395c5.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "6395c5e1-f2ec-4642-923d-9aebee203afe",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6395c5e1-f2ec-4642-923d-9aebee203afe.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4868",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"05b645fd998415b5b1e1265dd27dbf29\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886C6:76EF6A:5D74ACC0"
-    }
-  },
-  "uuid": "6395c5e1-f2ec-4642-923d-9aebee203afe",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..6c4379c906
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "6395c5e1-f2ec-4642-923d-9aebee203afe",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4868",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"05b645fd998415b5b1e1265dd27dbf29\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886C6:76EF6A:5D74ACC0"
+    }
+  },
+  "uuid": "6395c5e1-f2ec-4642-923d-9aebee203afe",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7-3bd5c3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7-3bd5c3.json
deleted file mode 100644
index fa403969b9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7-3bd5c3.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4866",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"93c7abff2744c89fff44602d06c4a1e9\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886E5:76EF8D:5D74ACC0"
-    }
-  },
-  "uuid": "3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..9ef7b36ee7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,51 @@
+{
+  "id": "3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4866",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"93c7abff2744c89fff44602d06c4a1e9\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886E5:76EF8D:5D74ACC0"
+    }
+  },
+  "uuid": "3bd5c32a-06aa-4f2b-9055-9b9ff1dd9618",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9-7331ed.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9-7331ed.json
deleted file mode 100644
index e1f39020ab..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9-7331ed.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "7331ed24-bb2d-46a6-a842-986f52a91a5e",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-7331ed24-bb2d-46a6-a842-986f52a91a5e.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4864",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3bfeb5940fea2c97485a04d0885cbb23\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:688753:76EFC4:5D74ACC2"
-    }
-  },
-  "uuid": "7331ed24-bb2d-46a6-a842-986f52a91a5e",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9.json
new file mode 100644
index 0000000000..905e976541
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api-9.json
@@ -0,0 +1,51 @@
+{
+  "id": "7331ed24-bb2d-46a6-a842-986f52a91a5e",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4864",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3bfeb5940fea2c97485a04d0885cbb23\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:688753:76EFC4:5D74ACC2"
+    }
+  },
+  "uuid": "7331ed24-bb2d-46a6-a842-986f52a91a5e",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8-04ae84.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8-04ae84.json
deleted file mode 100644
index 6de2704973..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8-04ae84.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "04ae8436-0239-47f1-9e0a-4c2987ca1378",
-  "name": "repos_github-api-test-org_github-api_contents_squashmerge",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/contents/squashMerge",
-    "method": "PUT",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"squashMerge\",\"message\":\"squashMerge\",\"branch\":\"test/squashMerge\",\"content\":\"c3F1YXNoTWVyZ2U=\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_contents_squashmerge-04ae8436-0239-47f1-9e0a-4c2987ca1378.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4865",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"55d3ba9450e30b1533d3b2630cafe7ba\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886F0:76EF9A:5D74ACC1"
-    }
-  },
-  "uuid": "04ae8436-0239-47f1-9e0a-4c2987ca1378",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8.json
new file mode 100644
index 0000000000..586840818f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_contents_squashmerge-8.json
@@ -0,0 +1,54 @@
+{
+  "id": "04ae8436-0239-47f1-9e0a-4c2987ca1378",
+  "name": "repos_github-api-test-org_github-api_contents_squashmerge",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/contents/squashMerge",
+    "method": "PUT",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"squashMerge\",\"message\":\"squashMerge\",\"branch\":\"test/squashMerge\",\"content\":\"c3F1YXNoTWVyZ2U=\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_contents_squashmerge-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4865",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"55d3ba9450e30b1533d3b2630cafe7ba\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886F0:76EF9A:5D74ACC1"
+    }
+  },
+  "uuid": "04ae8436-0239-47f1-9e0a-4c2987ca1378",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-9d910f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-9d910f.json
deleted file mode 100644
index b1daaf8fd9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-9d910f.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "9d910f89-f71e-441d-8781-cba77a54dd08",
-  "name": "repos_github-api-test-org_github-api_git_refs",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/refs",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"ref\":\"refs/heads/test/squashMerge\",\"sha\":\"912e2176a00e60e02196737e0ae4c218a14b5dcb\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-9d910f89-f71e-441d-8781-cba77a54dd08.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4867",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"b87362620c8682d8c473abd414562140\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/heads/test/squashMerge",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886CD:76EF71:5D74ACC0"
-    }
-  },
-  "uuid": "9d910f89-f71e-441d-8781-cba77a54dd08",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json
new file mode 100644
index 0000000000..e4b394cb56
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "9d910f89-f71e-441d-8781-cba77a54dd08",
+  "name": "repos_github-api-test-org_github-api_git_refs",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/refs",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"ref\":\"refs/heads/test/squashMerge\",\"sha\":\"912e2176a00e60e02196737e0ae4c218a14b5dcb\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4867",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"b87362620c8682d8c473abd414562140\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/heads/test/squashMerge",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886CD:76EF71:5D74ACC0"
+    }
+  },
+  "uuid": "9d910f89-f71e-441d-8781-cba77a54dd08",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-7bfa93.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-7bfa93.json
deleted file mode 100644
index 05346299a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-7bfa93.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "7bfa9315-c036-44af-bc3c-1e639325a8fe",
-  "name": "repos_github-api-test-org_github-api_git_refs_heads_master",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/refs/heads/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_master-7bfa9315-c036-44af-bc3c-1e639325a8fe.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4869",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"338be473b06d88295f3203e460eb7cc2\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886BC:76EF5F:5D74ACBF"
-    }
-  },
-  "uuid": "7bfa9315-c036-44af-bc3c-1e639325a8fe",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
new file mode 100644
index 0000000000..1d40301655
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
@@ -0,0 +1,49 @@
+{
+  "id": "7bfa9315-c036-44af-bc3c-1e639325a8fe",
+  "name": "repos_github-api-test-org_github-api_git_refs_heads_master",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/refs/heads/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_master-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4869",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"338be473b06d88295f3203e460eb7cc2\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:24:28 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886BC:76EF5F:5D74ACBF"
+    }
+  },
+  "uuid": "7bfa9315-c036-44af-bc3c-1e639325a8fe",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10-d149e4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10-d149e4.json
deleted file mode 100644
index ba79bddfe6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10-d149e4.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "d149e4dc-e134-4376-8b93-ce784a868247",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/squashMerge\",\"maintainer_can_modify\":true,\"title\":\"squashMerge\",\"body\":\"## test squash\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-d149e4dc-e134-4376-8b93-ce784a868247.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:52 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4863",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"2c03a2b8b61f0879aa89357491990eb9\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/267",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:68876F:76F016:5D74ACC3"
-    }
-  },
-  "uuid": "d149e4dc-e134-4376-8b93-ce784a868247",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10.json
new file mode 100644
index 0000000000..b5137682d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-10.json
@@ -0,0 +1,55 @@
+{
+  "id": "d149e4dc-e134-4376-8b93-ce784a868247",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/squashMerge\",\"maintainer_can_modify\":true,\"title\":\"squashMerge\",\"body\":\"## test squash\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:52 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4863",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"2c03a2b8b61f0879aa89357491990eb9\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/267",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:68876F:76F016:5D74ACC3"
+    }
+  },
+  "uuid": "d149e4dc-e134-4376-8b93-ce784a868247",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-13-1f5294.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-13-1f5294.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls_267_merge-11-504d0b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls_267_merge-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls_267_merge-11-504d0b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_github-api-test-org_github-api_pulls_267_merge-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1-b37e46.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1-b37e46.json
deleted file mode 100644
index f9f93cf02b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1-b37e46.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b37e46bb-87be-4613-88c7-dcba8c693074",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b37e46bb-87be-4613-88c7-dcba8c693074.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4872",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF94:9A2F:6886A1:76EF3A:5D74ACBF"
-    }
-  },
-  "uuid": "b37e46bb-87be-4613-88c7-dcba8c693074",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1.json
new file mode 100644
index 0000000000..5c36ec1e6d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b37e46bb-87be-4613-88c7-dcba8c693074",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4872",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF94:9A2F:6886A1:76EF3A:5D74ACBF"
+    }
+  },
+  "uuid": "b37e46bb-87be-4613-88c7-dcba8c693074",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/orgs_github-api-test-org-4b062368-3c1a-4ed9-8d16-f15b4bfadd20.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/orgs_github-api-test-org-4b062368-3c1a-4ed9-8d16-f15b4bfadd20.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api-cafd015e-b65c-41a6-9dc9-81b48e9bf803.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api-cafd015e-b65c-41a6-9dc9-81b48e9bf803.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls-e7589ec2-0f9c-4b08-a559-0f019f425217.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls-e7589ec2-0f9c-4b08-a559-0f019f425217.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299-59c3756e-2f08-4be6-bbe4-bd4725f6f27b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299-59c3756e-2f08-4be6-bbe4-bd4725f6f27b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-38f8763a-b045-43de-a850-e58b7b117590.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-38f8763a-b045-43de-a850-e58b7b117590.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/user-77ed943e-b741-40d5-bc1e-4414411ca129.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/user-77ed943e-b741-40d5-bc1e-4414411ca129.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/users_kohsuke2-8bcfc03d-57d3-4728-a550-9a7375923fa0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/users_kohsuke2-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/users_kohsuke2-8bcfc03d-57d3-4728-a550-9a7375923fa0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/__files/users_kohsuke2-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2-4b0623.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2-4b0623.json
deleted file mode 100644
index 6e5a8af07c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2-4b0623.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "4b062368-3c1a-4ed9-8d16-f15b4bfadd20",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4b062368-3c1a-4ed9-8d16-f15b4bfadd20.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"298cbc515b117c1f190a8250bf171341\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103EFC6:26DBD9D:5D988DD6"
-    }
-  },
-  "uuid": "4b062368-3c1a-4ed9-8d16-f15b4bfadd20",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..2ff223aa20
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,45 @@
+{
+  "id": "4b062368-3c1a-4ed9-8d16-f15b4bfadd20",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"298cbc515b117c1f190a8250bf171341\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103EFC6:26DBD9D:5D988DD6"
+    }
+  },
+  "uuid": "4b062368-3c1a-4ed9-8d16-f15b4bfadd20",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3-cafd01.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3-cafd01.json
deleted file mode 100644
index 83ab7b1d1b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3-cafd01.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "cafd015e-b65c-41a6-9dc9-81b48e9bf803",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-cafd015e-b65c-41a6-9dc9-81b48e9bf803.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4953",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"c4b1f0a72cafb814412ee2c1665614b1\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103EFCC:26DBDDB:5D988DD6"
-    }
-  },
-  "uuid": "cafd015e-b65c-41a6-9dc9-81b48e9bf803",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..f659ef7b3a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "cafd015e-b65c-41a6-9dc9-81b48e9bf803",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"c4b1f0a72cafb814412ee2c1665614b1\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103EFCC:26DBDDB:5D988DD6"
+    }
+  },
+  "uuid": "cafd015e-b65c-41a6-9dc9-81b48e9bf803",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-e7589e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-e7589e.json
deleted file mode 100644
index 39b9130a5f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-e7589e.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "e7589ec2-0f9c-4b08-a559-0f019f425217",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"testPullRequestReviewRequests\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-e7589ec2-0f9c-4b08-a559-0f019f425217.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4952",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "\"2d26fd1875d905a9fa8a9bf5ff480725\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/299",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103EFD9:26DBDF4:5D988DD6"
-    }
-  },
-  "uuid": "e7589ec2-0f9c-4b08-a559-0f019f425217",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..0edfc79b26
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,52 @@
+{
+  "id": "e7589ec2-0f9c-4b08-a559-0f019f425217",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"testPullRequestReviewRequests\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4952",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "\"2d26fd1875d905a9fa8a9bf5ff480725\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/299",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103EFD9:26DBDF4:5D988DD6"
+    }
+  },
+  "uuid": "e7589ec2-0f9c-4b08-a559-0f019f425217",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7-59c375.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7-59c375.json
deleted file mode 100644
index dda5752471..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7-59c375.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "59c3756e-2f08-4be6-bbe4-bd4725f6f27b",
-  "name": "repos_github-api-test-org_github-api_pulls_299",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/299",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_299-59c3756e-2f08-4be6-bbe4-bd4725f6f27b.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"2a4678b42aca1dd1ab51ad1b45c9cfbf\"",
-      "Last-Modified": "Sat, 05 Oct 2019 12:34:32 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103F024:26DBE79:5D988DD8"
-    }
-  },
-  "uuid": "59c3756e-2f08-4be6-bbe4-bd4725f6f27b",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7.json
new file mode 100644
index 0000000000..6b70f1a088
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299-7.json
@@ -0,0 +1,45 @@
+{
+  "id": "59c3756e-2f08-4be6-bbe4-bd4725f6f27b",
+  "name": "repos_github-api-test-org_github-api_pulls_299",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/299",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_299-7.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"2a4678b42aca1dd1ab51ad1b45c9cfbf\"",
+      "Last-Modified": "Sat, 05 Oct 2019 12:34:32 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103F024:26DBE79:5D988DD8"
+    }
+  },
+  "uuid": "59c3756e-2f08-4be6-bbe4-bd4725f6f27b",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6-38f876.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6-38f876.json
deleted file mode 100644
index e9a2648668..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6-38f876.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "38f8763a-b045-43de-a850-e58b7b117590",
-  "name": "repos_github-api-test-org_github-api_pulls_299_requested_reviewers",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/299/requested_reviewers",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"reviewers\":[\"kohsuke2\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_299_requested_reviewers-38f8763a-b045-43de-a850-e58b7b117590.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "\"b3328950dcd409e84ff9897e96649056\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/299",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103F00C:26DBE5A:5D988DD7"
-    }
-  },
-  "uuid": "38f8763a-b045-43de-a850-e58b7b117590",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json
new file mode 100644
index 0000000000..583715a173
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json
@@ -0,0 +1,52 @@
+{
+  "id": "38f8763a-b045-43de-a850-e58b7b117590",
+  "name": "repos_github-api-test-org_github-api_pulls_299_requested_reviewers",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/299/requested_reviewers",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"reviewers\":[\"kohsuke2\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_299_requested_reviewers-6.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "\"b3328950dcd409e84ff9897e96649056\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/299",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103F00C:26DBE5A:5D988DD7"
+    }
+  },
+  "uuid": "38f8763a-b045-43de-a850-e58b7b117590",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1-77ed94.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1-77ed94.json
deleted file mode 100644
index 41e081a488..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1-77ed94.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "77ed943e-b741-40d5-bc1e-4414411ca129",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-77ed943e-b741-40d5-bc1e-4414411ca129.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4959",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"1f70a8ac0c3cc9339b0b1ec25ef7d2b8\"",
-      "Last-Modified": "Sat, 21 Sep 2019 13:46:39 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103EFAB:26DBD91:5D988DD6"
-    }
-  },
-  "uuid": "77ed943e-b741-40d5-bc1e-4414411ca129",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1.json
new file mode 100644
index 0000000000..99fe42a0cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/user-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "77ed943e-b741-40d5-bc1e-4414411ca129",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"1f70a8ac0c3cc9339b0b1ec25ef7d2b8\"",
+      "Last-Modified": "Sat, 21 Sep 2019 13:46:39 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103EFAB:26DBD91:5D988DD6"
+    }
+  },
+  "uuid": "77ed943e-b741-40d5-bc1e-4414411ca129",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5-8bcfc0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5-8bcfc0.json
deleted file mode 100644
index df446a48ad..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5-8bcfc0.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "8bcfc03d-57d3-4728-a550-9a7375923fa0",
-  "name": "users_kohsuke2",
-  "request": {
-    "url": "/users/kohsuke2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke2-8bcfc03d-57d3-4728-a550-9a7375923fa0.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 12:34:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1570282323",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"b0cb0fddde3978711bded54d70ea66ba\"",
-      "Last-Modified": "Thu, 16 May 2019 20:59:50 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F731:15A7:103F006:26DBE46:5D988DD7"
-    }
-  },
-  "uuid": "8bcfc03d-57d3-4728-a550-9a7375923fa0",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5.json
new file mode 100644
index 0000000000..b8c06b6508
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestReviewRequests/mappings/users_kohsuke2-5.json
@@ -0,0 +1,45 @@
+{
+  "id": "8bcfc03d-57d3-4728-a550-9a7375923fa0",
+  "name": "users_kohsuke2",
+  "request": {
+    "url": "/users/kohsuke2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke2-5.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 12:34:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1570282323",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"b0cb0fddde3978711bded54d70ea66ba\"",
+      "Last-Modified": "Thu, 16 May 2019 20:59:50 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F731:15A7:103F006:26DBE46:5D988DD7"
+    }
+  },
+  "uuid": "8bcfc03d-57d3-4728-a550-9a7375923fa0",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org-8634de25-3d3d-47a6-a72a-de26a5190ce6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org-8634de25-3d3d-47a6-a72a-de26a5190ce6.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams-b84882f2-4778-47cb-bced-70eced02e28b.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams-b84882f2-4778-47cb-bced-70eced02e28b.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams_dummy-team-7052eece-1708-4d47-8f66-5d45136c43e6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams_dummy-team-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams_dummy-team-7052eece-1708-4d47-8f66-5d45136c43e6.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/orgs_github-api-test-org_teams_dummy-team-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api-92a8e470-1b50-4f84-a580-94b8cc1aa3b0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api-92a8e470-1b50-4f84-a580-94b8cc1aa3b0.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls-f9eb4ced-224a-4b9c-b9e6-fc98bdd40345.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls-f9eb4ced-224a-4b9c-b9e6-fc98bdd40345.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304-e091cbaf-316c-4092-8205-a0d35b299a8e.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304-e091cbaf-316c-4092-8205-a0d35b299a8e.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-7df56994-6c47-49ba-8563-e1fd22adf795.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-7df56994-6c47-49ba-8563-e1fd22adf795.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/teams_3451996-112cf6bd-f585-4cec-9ab9-f987a3704a98.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/teams_3451996-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/teams_3451996-112cf6bd-f585-4cec-9ab9-f987a3704a98.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/teams_3451996-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/user-c23a7fbe-af40-42fe-936e-b94485a32618.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/user-c23a7fbe-af40-42fe-936e-b94485a32618.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2-8634de.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2-8634de.json
deleted file mode 100644
index ba91a26432..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2-8634de.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8634de25-3d3d-47a6-a72a-de26a5190ce6",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-8634de25-3d3d-47a6-a72a-de26a5190ce6.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4424",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"298cbc515b117c1f190a8250bf171341\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F1278:1CD4EC:5D9896C4"
-    }
-  },
-  "uuid": "8634de25-3d3d-47a6-a72a-de26a5190ce6",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..3ca97970c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "8634de25-3d3d-47a6-a72a-de26a5190ce6",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4424",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"298cbc515b117c1f190a8250bf171341\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F1278:1CD4EC:5D9896C4"
+    }
+  },
+  "uuid": "8634de25-3d3d-47a6-a72a-de26a5190ce6",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5-b84882.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5-b84882.json
deleted file mode 100644
index ca3f7ab71f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5-b84882.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "b84882f2-4778-47cb-bced-70eced02e28b",
-  "name": "orgs_github-api-test-org_teams",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams-b84882f2-4778-47cb-bced-70eced02e28b.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sat, 05 Oct 2019 13:12:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4421",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"b508d7b438387a94dc1a4338e19f77ec\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F127C:1CD4FA:5D9896C5"
-    }
-  },
-  "uuid": "b84882f2-4778-47cb-bced-70eced02e28b",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5.json
new file mode 100644
index 0000000000..241c5e730d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams-5.json
@@ -0,0 +1,44 @@
+{
+  "id": "b84882f2-4778-47cb-bced-70eced02e28b",
+  "name": "orgs_github-api-test-org_teams",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams-5.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sat, 05 Oct 2019 13:12:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4421",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"b508d7b438387a94dc1a4338e19f77ec\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F127C:1CD4FA:5D9896C5"
+    }
+  },
+  "uuid": "b84882f2-4778-47cb-bced-70eced02e28b",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9-7052ee.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9-7052ee.json
deleted file mode 100644
index 1a26fedf73..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9-7052ee.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "7052eece-1708-4d47-8f66-5d45136c43e6",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-7052eece-1708-4d47-8f66-5d45136c43e6.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 17 Mar 2020 09:19:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1584440312",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"3760fae93c6e9cb6c970a0e6bdbcaf53\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:12:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F98A:4C84:18DACD9:3CB7D53:5E70962D"
-    }
-  },
-  "uuid": "7052eece-1708-4d47-8f66-5d45136c43e6",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9.json
new file mode 100644
index 0000000000..96df553445
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/orgs_github-api-test-org_teams_dummy-team-9.json
@@ -0,0 +1,46 @@
+{
+  "id": "7052eece-1708-4d47-8f66-5d45136c43e6",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-9.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 17 Mar 2020 09:19:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1584440312",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"3760fae93c6e9cb6c970a0e6bdbcaf53\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:12:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F98A:4C84:18DACD9:3CB7D53:5E70962D"
+    }
+  },
+  "uuid": "7052eece-1708-4d47-8f66-5d45136c43e6",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3-92a8e4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3-92a8e4.json
deleted file mode 100644
index cb2a2df689..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3-92a8e4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "92a8e470-1b50-4f84-a580-94b8cc1aa3b0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-92a8e470-1b50-4f84-a580-94b8cc1aa3b0.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4423",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"22bbded0f5f2623c8bdafd68f3eb625d\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F1279:1CD4F8:5D9896C4"
-    }
-  },
-  "uuid": "92a8e470-1b50-4f84-a580-94b8cc1aa3b0",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..33b9795cbc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "92a8e470-1b50-4f84-a580-94b8cc1aa3b0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4423",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"22bbded0f5f2623c8bdafd68f3eb625d\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F1279:1CD4F8:5D9896C4"
+    }
+  },
+  "uuid": "92a8e470-1b50-4f84-a580-94b8cc1aa3b0",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-f9eb4c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-f9eb4c.json
deleted file mode 100644
index 6a7e5a3b6e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4-f9eb4c.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "f9eb4ced-224a-4b9c-b9e6-fc98bdd40345",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"testPullRequestTeamReviewRequests\",\"body\":\"## test\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-f9eb4ced-224a-4b9c-b9e6-fc98bdd40345.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4422",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"dba07114e327e207bb5a4d70224649b0\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/304",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F127A:1CD4F9:5D9896C4"
-    }
-  },
-  "uuid": "f9eb4ced-224a-4b9c-b9e6-fc98bdd40345",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json
new file mode 100644
index 0000000000..a306005b3f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "f9eb4ced-224a-4b9c-b9e6-fc98bdd40345",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/stable\",\"maintainer_can_modify\":true,\"title\":\"testPullRequestTeamReviewRequests\",\"body\":\"## test\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-4.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4422",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"dba07114e327e207bb5a4d70224649b0\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/304",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F127A:1CD4F9:5D9896C4"
+    }
+  },
+  "uuid": "f9eb4ced-224a-4b9c-b9e6-fc98bdd40345",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7-e091cb.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7-e091cb.json
deleted file mode 100644
index 7e9cdb4c02..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7-e091cb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e091cbaf-316c-4092-8205-a0d35b299a8e",
-  "name": "repos_github-api-test-org_github-api_pulls_304",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/304",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_304-e091cbaf-316c-4092-8205-a0d35b299a8e.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4419",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aa9b2ce65e09e2860f6ceeae18ea5a55\"",
-      "Last-Modified": "Sat, 05 Oct 2019 13:12:37 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F1282:1CD503:5D9896C5"
-    }
-  },
-  "uuid": "e091cbaf-316c-4092-8205-a0d35b299a8e",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7.json
new file mode 100644
index 0000000000..cf60b862f9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "e091cbaf-316c-4092-8205-a0d35b299a8e",
+  "name": "repos_github-api-test-org_github-api_pulls_304",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/304",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_304-7.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4419",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aa9b2ce65e09e2860f6ceeae18ea5a55\"",
+      "Last-Modified": "Sat, 05 Oct 2019 13:12:37 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F1282:1CD503:5D9896C5"
+    }
+  },
+  "uuid": "e091cbaf-316c-4092-8205-a0d35b299a8e",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6-7df569.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6-7df569.json
deleted file mode 100644
index 58b6dc148f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6-7df569.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "7df56994-6c47-49ba-8563-e1fd22adf795",
-  "name": "repos_github-api-test-org_github-api_pulls_304_requested_reviewers",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls/304/requested_reviewers",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"team_reviewers\":[\"dummy-team\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls_304_requested_reviewers-7df56994-6c47-49ba-8563-e1fd22adf795.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4420",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"a1a9fea89c597072216ed266dc248469\"",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/304",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F127D:1CD4FD:5D9896C5"
-    }
-  },
-  "uuid": "7df56994-6c47-49ba-8563-e1fd22adf795",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json
new file mode 100644
index 0000000000..4842b1fa4d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "7df56994-6c47-49ba-8563-e1fd22adf795",
+  "name": "repos_github-api-test-org_github-api_pulls_304_requested_reviewers",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls/304/requested_reviewers",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"team_reviewers\":[\"dummy-team\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls_304_requested_reviewers-6.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4420",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"a1a9fea89c597072216ed266dc248469\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/304",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F127D:1CD4FD:5D9896C5"
+    }
+  },
+  "uuid": "7df56994-6c47-49ba-8563-e1fd22adf795",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8-112cf6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8-112cf6.json
deleted file mode 100644
index 2f2c2fb4a7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8-112cf6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "112cf6bd-f585-4cec-9ab9-f987a3704a98",
-  "name": "teams_3451996",
-  "request": {
-    "url": "/teams/3451996",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3451996-112cf6bd-f585-4cec-9ab9-f987a3704a98.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4418",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e833a703a1e111c864fb4378cb37b5fb\"",
-      "Last-Modified": "Thu, 03 Oct 2019 21:51:11 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F1285:1CD50A:5D9896C6"
-    }
-  },
-  "uuid": "112cf6bd-f585-4cec-9ab9-f987a3704a98",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8.json
new file mode 100644
index 0000000000..1a1f11b9d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/teams_3451996-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "112cf6bd-f585-4cec-9ab9-f987a3704a98",
+  "name": "teams_3451996",
+  "request": {
+    "url": "/teams/3451996",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3451996-8.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4418",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e833a703a1e111c864fb4378cb37b5fb\"",
+      "Last-Modified": "Thu, 03 Oct 2019 21:51:11 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F1285:1CD50A:5D9896C6"
+    }
+  },
+  "uuid": "112cf6bd-f585-4cec-9ab9-f987a3704a98",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1-c23a7f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1-c23a7f.json
deleted file mode 100644
index 3af28b6877..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1-c23a7f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c23a7fbe-af40-42fe-936e-b94485a32618",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c23a7fbe-af40-42fe-936e-b94485a32618.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 13:12:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4429",
-      "X-RateLimit-Reset": "1570284751",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1f70a8ac0c3cc9339b0b1ec25ef7d2b8\"",
-      "Last-Modified": "Sat, 21 Sep 2019 13:46:39 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8F3:099A:F1271:1CD4E2:5D9896C4"
-    }
-  },
-  "uuid": "c23a7fbe-af40-42fe-936e-b94485a32618",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1.json
new file mode 100644
index 0000000000..763f59824a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/testPullRequestTeamReviewRequests/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c23a7fbe-af40-42fe-936e-b94485a32618",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 13:12:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4429",
+      "X-RateLimit-Reset": "1570284751",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1f70a8ac0c3cc9339b0b1ec25ef7d2b8\"",
+      "Last-Modified": "Sat, 21 Sep 2019 13:46:39 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, read:packages, repo, user, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8F3:099A:F1271:1CD4E2:5D9896C4"
+    }
+  },
+  "uuid": "c23a7fbe-af40-42fe-936e-b94485a32618",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/orgs_github-api-test-org-ad1f5840-8218-409f-a4da-7f3533b80a39.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/orgs_github-api-test-org-ad1f5840-8218-409f-a4da-7f3533b80a39.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-2621291f-e181-41b0-98ad-3caf5f4fcf63.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-2621291f-e181-41b0-98ad-3caf5f4fcf63.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-ab64951f-76cf-4bcb-a38a-497717b29f96.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-ab64951f-76cf-4bcb-a38a-497717b29f96.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-14.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-5e4301dc-40ac-40eb-8424-8ac1bf7a8861.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-5e4301dc-40ac-40eb-8424-8ac1bf7a8861.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-620a6cec-3b31-4ac7-94be-d162928d0e11.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-620a6cec-3b31-4ac7-94be-d162928d0e11.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-3baea02b-9467-4f17-8b8c-369bd4eca9e2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-3baea02b-9467-4f17-8b8c-369bd4eca9e2.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-ea77125d-4094-4cd9-bfbe-da1696813034.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-ea77125d-4094-4cd9-bfbe-da1696813034.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-70ad84cc-ff4b-4567-95cd-eed864ce2fb3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-70ad84cc-ff4b-4567-95cd-eed864ce2fb3.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-1d6973ab-2bb2-4661-a449-6a3baf0da673.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-1d6973ab-2bb2-4661-a449-6a3baf0da673.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs-778d6679-3928-4f4c-beda-b8f1ae11aac3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs-778d6679-3928-4f4c-beda-b8f1ae11aac3.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-fa77be60-4286-4610-bff6-3ab0bac74b1f.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-fa77be60-4286-4610-bff6-3ab0bac74b1f.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_pulls-c55f0814-cb1e-4b41-a74d-e94e3eb0e843.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_pulls-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_pulls-c55f0814-cb1e-4b41-a74d-e94e3eb0e843.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/repos_github-api-test-org_github-api_pulls-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/user-78c0481f-0420-45ef-97f7-fabf21edf0e2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/user-78c0481f-0420-45ef-97f7-fabf21edf0e2.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2-ad1f58.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2-ad1f58.json
deleted file mode 100644
index bc09672d0a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2-ad1f58.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ad1f5840-8218-409f-a4da-7f3533b80a39",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-ad1f5840-8218-409f-a4da-7f3533b80a39.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4943",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA74D4:C68A83:5D74ACA2"
-    }
-  },
-  "uuid": "ad1f5840-8218-409f-a4da-7f3533b80a39",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..f272cbf533
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "ad1f5840-8218-409f-a4da-7f3533b80a39",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4943",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA74D4:C68A83:5D74ACA2"
+    }
+  },
+  "uuid": "ad1f5840-8218-409f-a4da-7f3533b80a39",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11-262129.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11-262129.json
deleted file mode 100644
index 98d50e17cd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11-262129.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2621291f-e181-41b0-98ad-3caf5f4fcf63",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-2621291f-e181-41b0-98ad-3caf5f4fcf63.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"eb0afb4590860dbc9e10e4a971fbf9b0\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA7665:C68C2C:5D74ACA6"
-    }
-  },
-  "uuid": "2621291f-e181-41b0-98ad-3caf5f4fcf63",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11.json
new file mode 100644
index 0000000000..655b5ea006
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-11.json
@@ -0,0 +1,51 @@
+{
+  "id": "2621291f-e181-41b0-98ad-3caf5f4fcf63",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-11.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"eb0afb4590860dbc9e10e4a971fbf9b0\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA7665:C68C2C:5D74ACA6"
+    }
+  },
+  "uuid": "2621291f-e181-41b0-98ad-3caf5f4fcf63",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14-ab6495.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14-ab6495.json
deleted file mode 100644
index a6d55517e5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14-ab6495.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ab64951f-76cf-4bcb-a38a-497717b29f96",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ab64951f-76cf-4bcb-a38a-497717b29f96.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4931",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a779b2e13990c43925dacc49a260a3c5\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA776E:C68D54:5D74ACAA"
-    }
-  },
-  "uuid": "ab64951f-76cf-4bcb-a38a-497717b29f96",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14.json
new file mode 100644
index 0000000000..3f2031f6b8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-14.json
@@ -0,0 +1,50 @@
+{
+  "id": "ab64951f-76cf-4bcb-a38a-497717b29f96",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-14.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a779b2e13990c43925dacc49a260a3c5\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA776E:C68D54:5D74ACAA"
+    }
+  },
+  "uuid": "ab64951f-76cf-4bcb-a38a-497717b29f96",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3-5e4301.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3-5e4301.json
deleted file mode 100644
index 3c2b649c48..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3-5e4301.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5e4301dc-40ac-40eb-8424-8ac1bf7a8861",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-5e4301dc-40ac-40eb-8424-8ac1bf7a8861.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4942",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fbfab4b5eab59d5ca9190cb9af741e11\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA74E8:C68A95:5D74ACA2"
-    }
-  },
-  "uuid": "5e4301dc-40ac-40eb-8424-8ac1bf7a8861",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..2d290bce1b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "5e4301dc-40ac-40eb-8424-8ac1bf7a8861",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4942",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fbfab4b5eab59d5ca9190cb9af741e11\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA74E8:C68A95:5D74ACA2"
+    }
+  },
+  "uuid": "5e4301dc-40ac-40eb-8424-8ac1bf7a8861",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5-620a6c.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5-620a6c.json
deleted file mode 100644
index 928af8e876..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5-620a6c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "620a6cec-3b31-4ac7-94be-d162928d0e11",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-620a6cec-3b31-4ac7-94be-d162928d0e11.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4940",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fbfab4b5eab59d5ca9190cb9af741e11\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA750B:C68ABE:5D74ACA2"
-    }
-  },
-  "uuid": "620a6cec-3b31-4ac7-94be-d162928d0e11",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..5c1e82422c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "620a6cec-3b31-4ac7-94be-d162928d0e11",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4940",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fbfab4b5eab59d5ca9190cb9af741e11\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA750B:C68ABE:5D74ACA2"
+    }
+  },
+  "uuid": "620a6cec-3b31-4ac7-94be-d162928d0e11",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7-3baea0.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7-3baea0.json
deleted file mode 100644
index 078607401e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7-3baea0.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3baea02b-9467-4f17-8b8c-369bd4eca9e2",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-3baea02b-9467-4f17-8b8c-369bd4eca9e2.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4938",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7cc3b675d9786125067481500fd9f8d4\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA755F:C68B0E:5D74ACA3"
-    }
-  },
-  "uuid": "3baea02b-9467-4f17-8b8c-369bd4eca9e2",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..492e3d8dd8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,51 @@
+{
+  "id": "3baea02b-9467-4f17-8b8c-369bd4eca9e2",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4938",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7cc3b675d9786125067481500fd9f8d4\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA755F:C68B0E:5D74ACA3"
+    }
+  },
+  "uuid": "3baea02b-9467-4f17-8b8c-369bd4eca9e2",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9-ea7712.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9-ea7712.json
deleted file mode 100644
index ba0567a5b4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9-ea7712.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "ea77125d-4094-4cd9-bfbe-da1696813034",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ea77125d-4094-4cd9-bfbe-da1696813034.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"476689c50d919384d02a3d812284c8cd\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA760B:C68B74:5D74ACA4"
-    }
-  },
-  "uuid": "ea77125d-4094-4cd9-bfbe-da1696813034",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9.json
new file mode 100644
index 0000000000..194ac86b47
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api-9.json
@@ -0,0 +1,51 @@
+{
+  "id": "ea77125d-4094-4cd9-bfbe-da1696813034",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"476689c50d919384d02a3d812284c8cd\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA760B:C68B74:5D74ACA4"
+    }
+  },
+  "uuid": "ea77125d-4094-4cd9-bfbe-da1696813034",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10-70ad84.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10-70ad84.json
deleted file mode 100644
index 2bb5229229..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10-70ad84.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "70ad84cc-ff4b-4567-95cd-eed864ce2fb3",
-  "name": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/contents/updateContentSquashMerge",
-    "method": "PUT",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"updateContentSquashMerge\",\"message\":\"updateContentSquashMerge\",\"branch\":\"test/updateContentSquashMerge\",\"sha\":\"ad7418321ba08809e4e25ad06bd48d3968bb3819\",\"content\":\"dXBkYXRlQ29udGVudFNxdWFzaE1lcmdldXBkYXRlQ29udGVudFNxdWFzaE1lcmdl\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-70ad84cc-ff4b-4567-95cd-eed864ce2fb3.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4935",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b2c60c5c4932d8f77563194675552446\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA7621:C68BEC:5D74ACA5"
-    }
-  },
-  "uuid": "70ad84cc-ff4b-4567-95cd-eed864ce2fb3",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json
new file mode 100644
index 0000000000..ceccecc831
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json
@@ -0,0 +1,54 @@
+{
+  "id": "70ad84cc-ff4b-4567-95cd-eed864ce2fb3",
+  "name": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/contents/updateContentSquashMerge",
+    "method": "PUT",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"updateContentSquashMerge\",\"message\":\"updateContentSquashMerge\",\"branch\":\"test/updateContentSquashMerge\",\"sha\":\"ad7418321ba08809e4e25ad06bd48d3968bb3819\",\"content\":\"dXBkYXRlQ29udGVudFNxdWFzaE1lcmdldXBkYXRlQ29udGVudFNxdWFzaE1lcmdl\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-10.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4935",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b2c60c5c4932d8f77563194675552446\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA7621:C68BEC:5D74ACA5"
+    }
+  },
+  "uuid": "70ad84cc-ff4b-4567-95cd-eed864ce2fb3",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8-1d6973.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8-1d6973.json
deleted file mode 100644
index 1e8f8a5e1f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8-1d6973.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "1d6973ab-2bb2-4661-a449-6a3baf0da673",
-  "name": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/contents/updateContentSquashMerge",
-    "method": "PUT",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"path\":\"updateContentSquashMerge\",\"message\":\"updateContentSquashMerge\",\"branch\":\"test/updateContentSquashMerge\",\"content\":\"dXBkYXRlQ29udGVudFNxdWFzaE1lcmdl\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-1d6973ab-2bb2-4661-a449-6a3baf0da673.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4937",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"ce670aee18f964bc760bdacc60d1a31f\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA756E:C68B2F:5D74ACA3"
-    }
-  },
-  "uuid": "1d6973ab-2bb2-4661-a449-6a3baf0da673",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json
new file mode 100644
index 0000000000..656f7d46a7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json
@@ -0,0 +1,54 @@
+{
+  "id": "1d6973ab-2bb2-4661-a449-6a3baf0da673",
+  "name": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/contents/updateContentSquashMerge",
+    "method": "PUT",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"path\":\"updateContentSquashMerge\",\"message\":\"updateContentSquashMerge\",\"branch\":\"test/updateContentSquashMerge\",\"content\":\"dXBkYXRlQ29udGVudFNxdWFzaE1lcmdl\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_contents_updatecontentsquashmerge-8.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4937",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"ce670aee18f964bc760bdacc60d1a31f\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA756E:C68B2F:5D74ACA3"
+    }
+  },
+  "uuid": "1d6973ab-2bb2-4661-a449-6a3baf0da673",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-778d66.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-778d66.json
deleted file mode 100644
index fb76d5fed3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6-778d66.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "778d6679-3928-4f4c-beda-b8f1ae11aac3",
-  "name": "repos_github-api-test-org_github-api_git_refs",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/refs",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"ref\":\"refs/heads/test/updateContentSquashMerge\",\"sha\":\"3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-778d6679-3928-4f4c-beda-b8f1ae11aac3.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4939",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"ef1495292577b64a037f529dcaf2232b\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/heads/test/updateContentSquashMerge",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA7521:C68AD5:5D74ACA2"
-    }
-  },
-  "uuid": "778d6679-3928-4f4c-beda-b8f1ae11aac3",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json
new file mode 100644
index 0000000000..e1a654e485
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "778d6679-3928-4f4c-beda-b8f1ae11aac3",
+  "name": "repos_github-api-test-org_github-api_git_refs",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/refs",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"ref\":\"refs/heads/test/updateContentSquashMerge\",\"sha\":\"3a09d2de4a9a1322a0ba2c3e2f54a919ca8fe353\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-6.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4939",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"ef1495292577b64a037f529dcaf2232b\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/heads/test/updateContentSquashMerge",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA7521:C68AD5:5D74ACA2"
+    }
+  },
+  "uuid": "778d6679-3928-4f4c-beda-b8f1ae11aac3",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-fa77be.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-fa77be.json
deleted file mode 100644
index 869a837e0b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4-fa77be.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "fa77be60-4286-4610-bff6-3ab0bac74b1f",
-  "name": "repos_github-api-test-org_github-api_git_refs_heads_master",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/refs/heads/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_master-fa77be60-4286-4610-bff6-3ab0bac74b1f.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4941",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"76290473b9107936edcf4ad2becf1f34\"",
-      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA74FC:C68AAC:5D74ACA2"
-    }
-  },
-  "uuid": "fa77be60-4286-4610-bff6-3ab0bac74b1f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
new file mode 100644
index 0000000000..ef05fdc705
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_git_refs_heads_master-4.json
@@ -0,0 +1,49 @@
+{
+  "id": "fa77be60-4286-4610-bff6-3ab0bac74b1f",
+  "name": "repos_github-api-test-org_github-api_git_refs_heads_master",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/refs/heads/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_refs_heads_master-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"76290473b9107936edcf4ad2becf1f34\"",
+      "Last-Modified": "Sun, 08 Sep 2019 07:21:20 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA74FC:C68AAC:5D74ACA2"
+    }
+  },
+  "uuid": "fa77be60-4286-4610-bff6-3ab0bac74b1f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12-c55f08.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12-c55f08.json
deleted file mode 100644
index 12d08f837e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12-c55f08.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "c55f0814-cb1e-4b41-a74d-e94e3eb0e843",
-  "name": "repos_github-api-test-org_github-api_pulls",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/pulls",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"head\":\"test/updateContentSquashMerge\",\"maintainer_can_modify\":true,\"title\":\"updateContentSquashMerge\",\"body\":\"## test squash\",\"base\":\"master\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.shadow-cat-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_pulls-c55f0814-cb1e-4b41-a74d-e94e3eb0e843.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"74632cb04927ace97b48d3e7c601dc33\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/261",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA767E:C68C40:5D74ACA6"
-    }
-  },
-  "uuid": "c55f0814-cb1e-4b41-a74d-e94e3eb0e843",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12.json
new file mode 100644
index 0000000000..8afc55a8f6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-12.json
@@ -0,0 +1,55 @@
+{
+  "id": "c55f0814-cb1e-4b41-a74d-e94e3eb0e843",
+  "name": "repos_github-api-test-org_github-api_pulls",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/pulls",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"head\":\"test/updateContentSquashMerge\",\"maintainer_can_modify\":true,\"title\":\"updateContentSquashMerge\",\"body\":\"## test squash\",\"base\":\"master\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.shadow-cat-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_pulls-12.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"74632cb04927ace97b48d3e7c601dc33\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/pulls/261",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA767E:C68C40:5D74ACA6"
+    }
+  },
+  "uuid": "c55f0814-cb1e-4b41-a74d-e94e3eb0e843",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-15-ac16f4.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-15-ac16f4.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls-15.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls_261_merge-13-0b05c7.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls_261_merge-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls_261_merge-13-0b05c7.json
rename to src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_github-api-test-org_github-api_pulls_261_merge-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1-78c048.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1-78c048.json
deleted file mode 100644
index 2d45465827..0000000000
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1-78c048.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "78c0481f-0420-45ef-97f7-fabf21edf0e2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-78c0481f-0420-45ef-97f7-fabf21edf0e2.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4944",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF7E:15CC:AA74C9:C68A74:5D74ACA1"
-    }
-  },
-  "uuid": "78c0481f-0420-45ef-97f7-fabf21edf0e2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1.json
new file mode 100644
index 0000000000..44c273da21
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "78c0481f-0420-45ef-97f7-fabf21edf0e2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:24:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4944",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF7E:15CC:AA74C9:C68A74:5D74ACA1"
+    }
+  },
+  "uuid": "78c0481f-0420-45ef-97f7-fabf21edf0e2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/orgs_github-api-test-org-7ea37b72-8b01-4ed5-a63d-98d32b2faa0f.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/orgs_github-api-test-org-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/orgs_github-api-test-org-7ea37b72-8b01-4ed5-a63d-98d32b2faa0f.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/orgs_github-api-test-org-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/rate_limit-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4-7ea37b.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4-7ea37b.json
deleted file mode 100644
index 8da888a4fe..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4-7ea37b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7ea37b72-8b01-4ed5-a63d-98d32b2faa0f",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-7ea37b72-8b01-4ed5-a63d-98d32b2faa0f.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f09f3a51ec515cfc6d836ec23caee560\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3BB:369BAB5:5D9B984B"
-    }
-  },
-  "uuid": "7ea37b72-8b01-4ed5-a63d-98d32b2faa0f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4.json
new file mode 100644
index 0000000000..d460673b58
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/orgs_github-api-test-org-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "7ea37b72-8b01-4ed5-a63d-98d32b2faa0f",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-4.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f09f3a51ec515cfc6d836ec23caee560\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3BB:369BAB5:5D9B984B"
+    }
+  },
+  "uuid": "7ea37b72-8b01-4ed5-a63d-98d32b2faa0f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2-f22b1c.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2-f22b1c.json
deleted file mode 100644
index 473e4c8a7b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2-f22b1c.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "f22b1cea-3679-481d-8b95-459b2c47bf98",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D346:369B91A:5D9B9848"
-    }
-  },
-  "uuid": "f22b1cea-3679-481d-8b95-459b2c47bf98",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-rate_limit-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..1841d4f5c6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "f22b1cea-3679-481d-8b95-459b2c47bf98",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D346:369B91A:5D9B9848"
+    }
+  },
+  "uuid": "f22b1cea-3679-481d-8b95-459b2c47bf98",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-rate_limit-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3-a1f82a.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3-a1f82a.json
deleted file mode 100644
index fdebc86e83..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3-a1f82a.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "a1f82a96-500c-4462-ae7b-e0159afa8208",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3B3:369BA1D:5D9B984A"
-    }
-  },
-  "uuid": "a1f82a96-500c-4462-ae7b-e0159afa8208",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "scenario-1-rate_limit-2",
-  "newScenarioState": "scenario-1-rate_limit-3",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3.json
new file mode 100644
index 0000000000..4fed50a49e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "a1f82a96-500c-4462-ae7b-e0159afa8208",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3B3:369BA1D:5D9B984A"
+    }
+  },
+  "uuid": "a1f82a96-500c-4462-ae7b-e0159afa8208",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "scenario-1-rate_limit-2",
+  "newScenarioState": "scenario-1-rate_limit-3",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5-4e2fc3.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5-4e2fc3.json
deleted file mode 100644
index c5e180bf53..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5-4e2fc3.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "{{testStartDate offset='63 minutes' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3D1:369BAD1:5D9B984C"
-    }
-  },
-  "uuid": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "scenario-1-rate_limit-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5.json
new file mode 100644
index 0000000000..3008d118d6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/rate_limit-5.json
@@ -0,0 +1,45 @@
+{
+  "id": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-5.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "{{testStartDate offset='63 minutes' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3D1:369BAD1:5D9B984C"
+    }
+  },
+  "uuid": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "scenario-1-rate_limit-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1-a460fd.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1-a460fd.json
deleted file mode 100644
index ea06d1f292..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1-a460fd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D266:369B909:5D9B9848"
-    }
-  },
-  "uuid": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1.json
new file mode 100644
index 0000000000..39ae997c0a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimit/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{testStartDate offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D266:369B909:5D9B9848"
+    }
+  },
+  "uuid": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/rate_limit-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2-f22b1c.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2-f22b1c.json
deleted file mode 100644
index a6370403d7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2-f22b1c.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "f22b1cea-3679-481d-8b95-459b2c47bf98",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json",
-    "headers": {
-      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D346:369B91A:5D9B9848"
-    }
-  },
-  "uuid": "f22b1cea-3679-481d-8b95-459b2c47bf98",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-rate_limit-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..5a957eab65
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "f22b1cea-3679-481d-8b95-459b2c47bf98",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D346:369B91A:5D9B9848"
+    }
+  },
+  "uuid": "f22b1cea-3679-481d-8b95-459b2c47bf98",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-rate_limit-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3-a1f82a.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3-a1f82a.json
deleted file mode 100644
index a4d2028d74..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3-a1f82a.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "a1f82a96-500c-4462-ae7b-e0159afa8208",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json",
-    "headers": {
-      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3B3:369BA1D:5D9B984A"
-    }
-  },
-  "uuid": "a1f82a96-500c-4462-ae7b-e0159afa8208",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "scenario-1-rate_limit-2",
-  "newScenarioState": "scenario-1-rate_limit-3",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3.json
new file mode 100644
index 0000000000..d5d7788223
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "a1f82a96-500c-4462-ae7b-e0159afa8208",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-3.json",
+    "headers": {
+      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3B3:369BA1D:5D9B984A"
+    }
+  },
+  "uuid": "a1f82a96-500c-4462-ae7b-e0159afa8208",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "scenario-1-rate_limit-2",
+  "newScenarioState": "scenario-1-rate_limit-3",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5-4e2fc3.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5-4e2fc3.json
deleted file mode 100644
index 45fa57e45d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5-4e2fc3.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json",
-    "headers": {
-      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3D1:369BAD1:5D9B984C"
-    }
-  },
-  "uuid": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "scenario-1-rate_limit-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5.json
new file mode 100644
index 0000000000..1cc286bb7d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/rate_limit-5.json
@@ -0,0 +1,45 @@
+{
+  "id": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-5.json",
+    "headers": {
+      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3D1:369BAD1:5D9B984C"
+    }
+  },
+  "uuid": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "scenario-1-rate_limit-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1-a460fd.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1-a460fd.json
deleted file mode 100644
index 16437b6f48..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1-a460fd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json",
-    "headers": {
-      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D266:369B909:5D9B9848"
-    }
-  },
-  "uuid": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1.json
new file mode 100644
index 0000000000..195928483b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesAhead/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now offset='5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{now offset='303 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D266:369B909:5D9B9848"
+    }
+  },
+  "uuid": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/rate_limit-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json
rename to src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2-f22b1c.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2-f22b1c.json
deleted file mode 100644
index 3394a5806d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2-f22b1c.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "f22b1cea-3679-481d-8b95-459b2c47bf98",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-f22b1cea-3679-481d-8b95-459b2c47bf98.json",
-    "headers": {
-      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D346:369B91A:5D9B9848"
-    }
-  },
-  "uuid": "f22b1cea-3679-481d-8b95-459b2c47bf98",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-rate_limit-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..bf1bb772ff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "f22b1cea-3679-481d-8b95-459b2c47bf98",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D346:369B91A:5D9B9848"
+    }
+  },
+  "uuid": "f22b1cea-3679-481d-8b95-459b2c47bf98",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-rate_limit-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3-a1f82a.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3-a1f82a.json
deleted file mode 100644
index 8f53ea7b05..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3-a1f82a.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "a1f82a96-500c-4462-ae7b-e0159afa8208",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-a1f82a96-500c-4462-ae7b-e0159afa8208.json",
-    "headers": {
-      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3B3:369BA1D:5D9B984A"
-    }
-  },
-  "uuid": "a1f82a96-500c-4462-ae7b-e0159afa8208",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "scenario-1-rate_limit-2",
-  "newScenarioState": "scenario-1-rate_limit-3",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3.json
new file mode 100644
index 0000000000..f28d6f3c93
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-3.json
@@ -0,0 +1,46 @@
+{
+  "id": "a1f82a96-500c-4462-ae7b-e0159afa8208",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-3.json",
+    "headers": {
+      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3B3:369BA1D:5D9B984A"
+    }
+  },
+  "uuid": "a1f82a96-500c-4462-ae7b-e0159afa8208",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "scenario-1-rate_limit-2",
+  "newScenarioState": "scenario-1-rate_limit-3",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5-4e2fc3.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5-4e2fc3.json
deleted file mode 100644
index 352c0ca5b3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5-4e2fc3.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-4e2fc33b-fb25-4dfc-9d56-34f9b4d707be.json",
-    "headers": {
-      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4896",
-      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D3D1:369BAD1:5D9B984C"
-    }
-  },
-  "uuid": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
-  "persistent": true,
-  "scenarioName": "scenario-1-rate_limit",
-  "requiredScenarioState": "scenario-1-rate_limit-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5.json
new file mode 100644
index 0000000000..193d5b4d7e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/rate_limit-5.json
@@ -0,0 +1,45 @@
+{
+  "id": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-5.json",
+    "headers": {
+      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4896",
+      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D3D1:369BAD1:5D9B984C"
+    }
+  },
+  "uuid": "4e2fc33b-fb25-4dfc-9d56-34f9b4d707be",
+  "persistent": true,
+  "scenarioName": "scenario-1-rate_limit",
+  "requiredScenarioState": "scenario-1-rate_limit-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1-a460fd.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1-a460fd.json
deleted file mode 100644
index 09064ef5cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1-a460fd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a460fd69-99f3-46c7-aeb1-888c34085d4a.json",
-    "headers": {
-      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E39F:3620:2D9D266:369B909:5D9B9848"
-    }
-  },
-  "uuid": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1.json
new file mode 100644
index 0000000000..b3af5cb11d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRateLimitTest/wiremock/testGitHubRateLimitExpirationServerFiveMinutesBehind/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now offset='-5 minutes' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "{{now offset='-297 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E39F:3620:2D9D266:369B909:5D9B9848"
+    }
+  },
+  "uuid": "a460fd69-99f3-46c7-aeb1-888c34085d4a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/orgs_github-api-test-org-17df55cd-86fa-40f7-93c9-069b34d0e885.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/orgs_github-api-test-org-17df55cd-86fa-40f7-93c9-069b34d0e885.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api-6fede042-34ef-490c-ab77-fe2ce7d034c3.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api-6fede042-34ef-490c-ab77-fe2ce7d034c3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api_stats_code_frequency-09de1d80-83e2-45a8-987f-204eb7ea42a4.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api_stats_code_frequency-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api_stats_code_frequency-09de1d80-83e2-45a8-987f-204eb7ea42a4.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/repos_github-api-test-org_github-api_stats_code_frequency-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/user-2c19f62c-49ab-4bd3-b83d-138831bc0e49.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/user-2c19f62c-49ab-4bd3-b83d-138831bc0e49.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2-17df55.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2-17df55.json
deleted file mode 100644
index 0633717abe..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2-17df55.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "17df55cd-86fa-40f7-93c9-069b34d0e885",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-17df55cd-86fa-40f7-93c9-069b34d0e885.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F3:361D:196A708:1E5F8A7:5D981BCF"
-    }
-  },
-  "uuid": "17df55cd-86fa-40f7-93c9-069b34d0e885",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..f222293ee4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "17df55cd-86fa-40f7-93c9-069b34d0e885",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F3:361D:196A708:1E5F8A7:5D981BCF"
+    }
+  },
+  "uuid": "17df55cd-86fa-40f7-93c9-069b34d0e885",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3-6fede0.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3-6fede0.json
deleted file mode 100644
index 0f391fff54..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3-6fede0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6fede042-34ef-490c-ab77-fe2ce7d034c3",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6fede042-34ef-490c-ab77-fe2ce7d034c3.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4961",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F3:361D:196A716:1E5F8C1:5D981BD0"
-    }
-  },
-  "uuid": "6fede042-34ef-490c-ab77-fe2ce7d034c3",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..27fdf7b990
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6fede042-34ef-490c-ab77-fe2ce7d034c3",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4961",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F3:361D:196A716:1E5F8C1:5D981BD0"
+    }
+  },
+  "uuid": "6fede042-34ef-490c-ab77-fe2ce7d034c3",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4-09de1d.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4-09de1d.json
deleted file mode 100644
index 87756b3d94..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4-09de1d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "09de1d80-83e2-45a8-987f-204eb7ea42a4",
-  "name": "repos_github-api-test-org_github-api_stats_code_frequency",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/stats/code_frequency",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_stats_code_frequency-09de1d80-83e2-45a8-987f-204eb7ea42a4.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4960",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c487636beef39d7b617ec262a72fc4b7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F3:361D:196A726:1E5F8D1:5D981BD0"
-    }
-  },
-  "uuid": "09de1d80-83e2-45a8-987f-204eb7ea42a4",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4.json
new file mode 100644
index 0000000000..822719b834
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/repos_github-api-test-org_github-api_stats_code_frequency-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "09de1d80-83e2-45a8-987f-204eb7ea42a4",
+  "name": "repos_github-api-test-org_github-api_stats_code_frequency",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/stats/code_frequency",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_stats_code_frequency-4.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4960",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c487636beef39d7b617ec262a72fc4b7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F3:361D:196A726:1E5F8D1:5D981BD0"
+    }
+  },
+  "uuid": "09de1d80-83e2-45a8-987f-204eb7ea42a4",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1-2c19f6.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1-2c19f6.json
deleted file mode 100644
index 0a295fb0b5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1-2c19f6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2c19f62c-49ab-4bd3-b83d-138831bc0e49",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-2c19f62c-49ab-4bd3-b83d-138831bc0e49.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F3:361D:196A6F1:1E5F89A:5D981BCF"
-    }
-  },
-  "uuid": "2c19f62c-49ab-4bd3-b83d-138831bc0e49",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1.json
new file mode 100644
index 0000000000..8e12b6c67f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCodeFrequency/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "2c19f62c-49ab-4bd3-b83d-138831bc0e49",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F3:361D:196A6F1:1E5F89A:5D981BCF"
+    }
+  },
+  "uuid": "2c19f62c-49ab-4bd3-b83d-138831bc0e49",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/orgs_github-api-test-org-4edea480-acf1-40ee-9636-e8842a01a9ea.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/orgs_github-api-test-org-4edea480-acf1-40ee-9636-e8842a01a9ea.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api-6f33ad9d-feac-4b53-aa4a-c3b0f924a640.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api-6f33ad9d-feac-4b53-aa4a-c3b0f924a640.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api_stats_commit_activity-54ebe063-0972-46bc-ba2c-12abdb28fcf0.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api_stats_commit_activity-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api_stats_commit_activity-54ebe063-0972-46bc-ba2c-12abdb28fcf0.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/repos_github-api-test-org_github-api_stats_commit_activity-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/user-68a31e43-509d-476b-bebd-29a7129c9b2d.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/user-68a31e43-509d-476b-bebd-29a7129c9b2d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2-4edea4.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2-4edea4.json
deleted file mode 100644
index 58cf3d5739..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2-4edea4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4edea480-acf1-40ee-9636-e8842a01a9ea",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4edea480-acf1-40ee-9636-e8842a01a9ea.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4952",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4FB:361D:196A7E7:1E5F993:5D981BD1"
-    }
-  },
-  "uuid": "4edea480-acf1-40ee-9636-e8842a01a9ea",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..e76bb8ecad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4edea480-acf1-40ee-9636-e8842a01a9ea",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4952",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4FB:361D:196A7E7:1E5F993:5D981BD1"
+    }
+  },
+  "uuid": "4edea480-acf1-40ee-9636-e8842a01a9ea",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3-6f33ad.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3-6f33ad.json
deleted file mode 100644
index d0cadc2258..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3-6f33ad.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6f33ad9d-feac-4b53-aa4a-c3b0f924a640",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6f33ad9d-feac-4b53-aa4a-c3b0f924a640.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4FB:361D:196A823:1E5F9F2:5D981BD2"
-    }
-  },
-  "uuid": "6f33ad9d-feac-4b53-aa4a-c3b0f924a640",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..ab2fdbd8fa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6f33ad9d-feac-4b53-aa4a-c3b0f924a640",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4FB:361D:196A823:1E5F9F2:5D981BD2"
+    }
+  },
+  "uuid": "6f33ad9d-feac-4b53-aa4a-c3b0f924a640",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4-54ebe0.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4-54ebe0.json
deleted file mode 100644
index 192bd11851..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4-54ebe0.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "54ebe063-0972-46bc-ba2c-12abdb28fcf0",
-  "name": "repos_github-api-test-org_github-api_stats_commit_activity",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/stats/commit_activity",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_stats_commit_activity-54ebe063-0972-46bc-ba2c-12abdb28fcf0.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"09b8e8838a0b1400ca67c67210ad38e2\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4FB:361D:196A84C:1E5FA22:5D981BD2"
-    }
-  },
-  "uuid": "54ebe063-0972-46bc-ba2c-12abdb28fcf0",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4.json
new file mode 100644
index 0000000000..567ec89a2e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/repos_github-api-test-org_github-api_stats_commit_activity-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "54ebe063-0972-46bc-ba2c-12abdb28fcf0",
+  "name": "repos_github-api-test-org_github-api_stats_commit_activity",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/stats/commit_activity",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_stats_commit_activity-4.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"09b8e8838a0b1400ca67c67210ad38e2\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4FB:361D:196A84C:1E5FA22:5D981BD2"
+    }
+  },
+  "uuid": "54ebe063-0972-46bc-ba2c-12abdb28fcf0",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1-68a31e.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1-68a31e.json
deleted file mode 100644
index 426d5cfa44..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1-68a31e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "68a31e43-509d-476b-bebd-29a7129c9b2d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-68a31e43-509d-476b-bebd-29a7129c9b2d.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4FB:361D:196A7B6:1E5F976:5D981BD1"
-    }
-  },
-  "uuid": "68a31e43-509d-476b-bebd-29a7129c9b2d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1.json
new file mode 100644
index 0000000000..5cedef6d02
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testCommitActivity/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "68a31e43-509d-476b-bebd-29a7129c9b2d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4FB:361D:196A7B6:1E5F976:5D981BD1"
+    }
+  },
+  "uuid": "68a31e43-509d-476b-bebd-29a7129c9b2d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/orgs_github-api-test-org-4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/orgs_github-api-test-org-4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api-6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api-6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api_stats_contributors-722ef788-c190-4e69-a84a-9ad367d6630d.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api_stats_contributors-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api_stats_contributors-722ef788-c190-4e69-a84a-9ad367d6630d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/repos_github-api-test-org_github-api_stats_contributors-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/user-8442a6db-0547-45de-9b65-259e1fe4d673.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/user-8442a6db-0547-45de-9b65-259e1fe4d673.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2-4da8ec.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2-4da8ec.json
deleted file mode 100644
index aa54737a8e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2-4da8ec.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EA:6B2E:233FA5D:29B6616:5D981BCB"
-    }
-  },
-  "uuid": "4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..c73099e505
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EA:6B2E:233FA5D:29B6616:5D981BCB"
+    }
+  },
+  "uuid": "4da8ece7-db7b-4b2d-85ef-8c617bc2cf0e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3-6d11bb.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3-6d11bb.json
deleted file mode 100644
index a075039694..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3-6d11bb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EA:6B2E:233FA6B:29B6647:5D981BCC"
-    }
-  },
-  "uuid": "6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..4e735699c5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EA:6B2E:233FA6B:29B6647:5D981BCC"
+    }
+  },
+  "uuid": "6d11bbfd-0ddf-4867-bfe9-2896f9adb8e2",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4-722ef7.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4-722ef7.json
deleted file mode 100644
index 940a9cf2a0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4-722ef7.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "722ef788-c190-4e69-a84a-9ad367d6630d",
-  "name": "repos_github-api-test-org_github-api_stats_contributors",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/stats/contributors",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_stats_contributors-722ef788-c190-4e69-a84a-9ad367d6630d.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b24d9b31e6f4100367d2aa237f5fbb55\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EA:6B2E:233FA7E:29B665D:5D981BCC"
-    }
-  },
-  "uuid": "722ef788-c190-4e69-a84a-9ad367d6630d",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4.json
new file mode 100644
index 0000000000..70a76156de
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/repos_github-api-test-org_github-api_stats_contributors-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "722ef788-c190-4e69-a84a-9ad367d6630d",
+  "name": "repos_github-api-test-org_github-api_stats_contributors",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/stats/contributors",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_stats_contributors-4.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b24d9b31e6f4100367d2aa237f5fbb55\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EA:6B2E:233FA7E:29B665D:5D981BCC"
+    }
+  },
+  "uuid": "722ef788-c190-4e69-a84a-9ad367d6630d",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1-8442a6.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1-8442a6.json
deleted file mode 100644
index 113b5a3a46..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1-8442a6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8442a6db-0547-45de-9b65-259e1fe4d673",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8442a6db-0547-45de-9b65-259e1fe4d673.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EA:6B2E:233FA30:29B6607:5D981BCB"
-    }
-  },
-  "uuid": "8442a6db-0547-45de-9b65-259e1fe4d673",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1.json
new file mode 100644
index 0000000000..2f2f3c2f3d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testContributorStats/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8442a6db-0547-45de-9b65-259e1fe4d673",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EA:6B2E:233FA30:29B6607:5D981BCB"
+    }
+  },
+  "uuid": "8442a6db-0547-45de-9b65-259e1fe4d673",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/orgs_github-api-test-org-bc8f8b96-f45a-4539-a3e3-5f59a1c30c17.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/orgs_github-api-test-org-bc8f8b96-f45a-4539-a3e3-5f59a1c30c17.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/repos_github-api-test-org_github-api-7631fa24-ceab-4d0f-8f22-f1041dcd792a.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/repos_github-api-test-org_github-api-7631fa24-ceab-4d0f-8f22-f1041dcd792a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/user-a809afbf-ab4e-4117-86aa-da70544ee1bb.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/user-a809afbf-ab4e-4117-86aa-da70544ee1bb.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2-bc8f8b.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2-bc8f8b.json
deleted file mode 100644
index b27d782de9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2-bc8f8b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bc8f8b96-f45a-4539-a3e3-5f59a1c30c17",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-bc8f8b96-f45a-4539-a3e3-5f59a1c30c17.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4957",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F7:361D:196A75C:1E5F901:5D981BD0"
-    }
-  },
-  "uuid": "bc8f8b96-f45a-4539-a3e3-5f59a1c30c17",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..46995712d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "bc8f8b96-f45a-4539-a3e3-5f59a1c30c17",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4957",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F7:361D:196A75C:1E5F901:5D981BD0"
+    }
+  },
+  "uuid": "bc8f8b96-f45a-4539-a3e3-5f59a1c30c17",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3-7631fa.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3-7631fa.json
deleted file mode 100644
index f5742a5785..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3-7631fa.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7631fa24-ceab-4d0f-8f22-f1041dcd792a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-7631fa24-ceab-4d0f-8f22-f1041dcd792a.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4956",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F7:361D:196A776:1E5F932:5D981BD0"
-    }
-  },
-  "uuid": "7631fa24-ceab-4d0f-8f22-f1041dcd792a",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..e20af19632
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "7631fa24-ceab-4d0f-8f22-f1041dcd792a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F7:361D:196A776:1E5F932:5D981BD0"
+    }
+  },
+  "uuid": "7631fa24-ceab-4d0f-8f22-f1041dcd792a",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api_stats_participation-4-9ae337.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api_stats_participation-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api_stats_participation-4-9ae337.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/repos_github-api-test-org_github-api_stats_participation-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1-a809af.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1-a809af.json
deleted file mode 100644
index 9be5062e51..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1-a809af.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a809afbf-ab4e-4117-86aa-da70544ee1bb",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a809afbf-ab4e-4117-86aa-da70544ee1bb.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4959",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4F7:361D:196A739:1E5F8ED:5D981BD0"
-    }
-  },
-  "uuid": "a809afbf-ab4e-4117-86aa-da70544ee1bb",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1.json
new file mode 100644
index 0000000000..bd47de0dc8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testParticipation/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a809afbf-ab4e-4117-86aa-da70544ee1bb",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:28:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4F7:361D:196A739:1E5F8ED:5D981BD0"
+    }
+  },
+  "uuid": "a809afbf-ab4e-4117-86aa-da70544ee1bb",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/orgs_github-api-test-org-754abf86-100a-406e-b1f0-8af9e395d4b8.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/orgs_github-api-test-org-754abf86-100a-406e-b1f0-8af9e395d4b8.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api-b2ea09da-c234-4d3e-a636-e479e4234863.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api-b2ea09da-c234-4d3e-a636-e479e4234863.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api_stats_punch_card-e401c59f-b7f3-42e9-8d49-8dae9c25b72f.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api_stats_punch_card-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api_stats_punch_card-e401c59f-b7f3-42e9-8d49-8dae9c25b72f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/repos_github-api-test-org_github-api_stats_punch_card-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/user-49e5cd05-8aa2-4e37-a72e-7ffb584c1422.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/user-49e5cd05-8aa2-4e37-a72e-7ffb584c1422.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2-754abf.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2-754abf.json
deleted file mode 100644
index 0d4738c4be..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2-754abf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "754abf86-100a-406e-b1f0-8af9e395d4b8",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-754abf86-100a-406e-b1f0-8af9e395d4b8.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EF:361C:C71F2D:ED4915:5D981BCE"
-    }
-  },
-  "uuid": "754abf86-100a-406e-b1f0-8af9e395d4b8",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..422c347cfb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "754abf86-100a-406e-b1f0-8af9e395d4b8",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"511c83f13dd1d0697f68879f1a183f6f\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EF:361C:C71F2D:ED4915:5D981BCE"
+    }
+  },
+  "uuid": "754abf86-100a-406e-b1f0-8af9e395d4b8",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3-b2ea09.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3-b2ea09.json
deleted file mode 100644
index 2c35e074cc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3-b2ea09.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b2ea09da-c234-4d3e-a636-e479e4234863",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-b2ea09da-c234-4d3e-a636-e479e4234863.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EF:361C:C71F34:ED4925:5D981BCF"
-    }
-  },
-  "uuid": "b2ea09da-c234-4d3e-a636-e479e4234863",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..5a2dcfd9a6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "b2ea09da-c234-4d3e-a636-e479e4234863",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8960c5c8afa27b9c8267a48a1973444c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EF:361C:C71F34:ED4925:5D981BCF"
+    }
+  },
+  "uuid": "b2ea09da-c234-4d3e-a636-e479e4234863",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4-e401c5.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4-e401c5.json
deleted file mode 100644
index 4bb4a7a59c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4-e401c5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "e401c59f-b7f3-42e9-8d49-8dae9c25b72f",
-  "name": "repos_github-api-test-org_github-api_stats_punch_card",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/stats/punch_card",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_stats_punch_card-e401c59f-b7f3-42e9-8d49-8dae9c25b72f.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4965",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"28962769fa7a4174393c330fa50de3d4\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EF:361C:C71F3A:ED492C:5D981BCF"
-    }
-  },
-  "uuid": "e401c59f-b7f3-42e9-8d49-8dae9c25b72f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4.json
new file mode 100644
index 0000000000..8aacf76320
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/repos_github-api-test-org_github-api_stats_punch_card-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "e401c59f-b7f3-42e9-8d49-8dae9c25b72f",
+  "name": "repos_github-api-test-org_github-api_stats_punch_card",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/stats/punch_card",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_stats_punch_card-4.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4965",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"28962769fa7a4174393c330fa50de3d4\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EF:361C:C71F3A:ED492C:5D981BCF"
+    }
+  },
+  "uuid": "e401c59f-b7f3-42e9-8d49-8dae9c25b72f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1-49e5cd.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1-49e5cd.json
deleted file mode 100644
index 6cf42bb5b6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1-49e5cd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "49e5cd05-8aa2-4e37-a72e-7ffb584c1422",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-49e5cd05-8aa2-4e37-a72e-7ffb584c1422.json",
-    "headers": {
-      "Date": "Sat, 05 Oct 2019 04:27:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4969",
-      "X-RateLimit-Reset": "1570253246",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F4EF:361C:C71F1E:ED490B:5D981BCE"
-    }
-  },
-  "uuid": "49e5cd05-8aa2-4e37-a72e-7ffb584c1422",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1.json
new file mode 100644
index 0000000000..623f70f70d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryStatisticsTest/wiremock/testPunchCard/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "49e5cd05-8aa2-4e37-a72e-7ffb584c1422",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 05 Oct 2019 04:27:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4969",
+      "X-RateLimit-Reset": "1570253246",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F4EF:361C:C71F1E:ED490B:5D981BCE"
+    }
+  },
+  "uuid": "49e5cd05-8aa2-4e37-a72e-7ffb584c1422",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber-572d41eb-82bd-4b68-8bda-c723b1e9521e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber-572d41eb-82bd-4b68-8bda-c723b1e9521e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber_releases_latest-d2547b1f-1bc8-46a6-810c-48661d7fed2c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber_releases_latest-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber_releases_latest-d2547b1f-1bc8-46a6-810c-48661d7fed2c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/repos_kamontat_checkidnumber_releases_latest-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/user-b9c99aa8-3e3d-435c-98e0-3af8eafc960a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/user-b9c99aa8-3e3d-435c-98e0-3af8eafc960a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2-572d41.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2-572d41.json
deleted file mode 100644
index 89bfbd4be7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2-572d41.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "572d41eb-82bd-4b68-8bda-c723b1e9521e",
-  "name": "repos_kamontat_checkidnumber",
-  "request": {
-    "url": "/repos/kamontat/CheckIDNumber",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kamontat_checkidnumber-572d41eb-82bd-4b68-8bda-c723b1e9521e.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4917",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fc7a2f49e4b789a72bb4853ad2b01da8\"",
-      "Last-Modified": "Sat, 11 Feb 2017 17:06:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F358:3620:11B6149:1536E9B:5D964444"
-    }
-  },
-  "uuid": "572d41eb-82bd-4b68-8bda-c723b1e9521e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2.json
new file mode 100644
index 0000000000..c4371ce581
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "572d41eb-82bd-4b68-8bda-c723b1e9521e",
+  "name": "repos_kamontat_checkidnumber",
+  "request": {
+    "url": "/repos/kamontat/CheckIDNumber",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kamontat_checkidnumber-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4917",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fc7a2f49e4b789a72bb4853ad2b01da8\"",
+      "Last-Modified": "Sat, 11 Feb 2017 17:06:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F358:3620:11B6149:1536E9B:5D964444"
+    }
+  },
+  "uuid": "572d41eb-82bd-4b68-8bda-c723b1e9521e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3-d2547b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3-d2547b.json
deleted file mode 100644
index 7460eb4e28..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3-d2547b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d2547b1f-1bc8-46a6-810c-48661d7fed2c",
-  "name": "repos_kamontat_checkidnumber_releases_latest",
-  "request": {
-    "url": "/repos/kamontat/CheckIDNumber/releases/latest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kamontat_checkidnumber_releases_latest-d2547b1f-1bc8-46a6-810c-48661d7fed2c.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4916",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"faa29a16cc217701c2031c275784f4c8\"",
-      "Last-Modified": "Sun, 11 Jun 2017 16:12:58 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F358:3620:11B6166:1536EE5:5D964444"
-    }
-  },
-  "uuid": "d2547b1f-1bc8-46a6-810c-48661d7fed2c",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3.json
new file mode 100644
index 0000000000..06c77beb52
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/repos_kamontat_checkidnumber_releases_latest-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d2547b1f-1bc8-46a6-810c-48661d7fed2c",
+  "name": "repos_kamontat_checkidnumber_releases_latest",
+  "request": {
+    "url": "/repos/kamontat/CheckIDNumber/releases/latest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kamontat_checkidnumber_releases_latest-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4916",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"faa29a16cc217701c2031c275784f4c8\"",
+      "Last-Modified": "Sun, 11 Jun 2017 16:12:58 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F358:3620:11B6166:1536EE5:5D964444"
+    }
+  },
+  "uuid": "d2547b1f-1bc8-46a6-810c-48661d7fed2c",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1-b9c99a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1-b9c99a.json
deleted file mode 100644
index ea3de4cd5a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1-b9c99a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b9c99aa8-3e3d-435c-98e0-3af8eafc960a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b9c99aa8-3e3d-435c-98e0-3af8eafc960a.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F358:3620:11B6100:1536E6E:5D964443"
-    }
-  },
-  "uuid": "b9c99aa8-3e3d-435c-98e0-3af8eafc960a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1.json
new file mode 100644
index 0000000000..989de0f997
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryExist/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b9c99aa8-3e3d-435c-98e0-3af8eafc960a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F358:3620:11B6100:1536E6E:5D964443"
+    }
+  },
+  "uuid": "b9c99aa8-3e3d-435c-98e0-3af8eafc960a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/repos_kamontat_java8example-7752c1cb-ba51-4716-8321-7e9a6d3fa34a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/repos_kamontat_java8example-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/repos_kamontat_java8example-7752c1cb-ba51-4716-8321-7e9a6d3fa34a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/repos_kamontat_java8example-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/user-53c4464c-df7f-40cd-94d2-72b47c9a4999.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/user-53c4464c-df7f-40cd-94d2-72b47c9a4999.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2-7752c1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2-7752c1.json
deleted file mode 100644
index 874f55cf9e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2-7752c1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7752c1cb-ba51-4716-8321-7e9a6d3fa34a",
-  "name": "repos_kamontat_java8example",
-  "request": {
-    "url": "/repos/kamontat/Java8Example",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_kamontat_java8example-7752c1cb-ba51-4716-8321-7e9a6d3fa34a.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4895",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f87bbb29d760b6147c3705d7d07c11ea\"",
-      "Last-Modified": "Mon, 11 Jul 2016 09:52:53 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F366:361D:FDE7C1:12E647D:5D964449"
-    }
-  },
-  "uuid": "7752c1cb-ba51-4716-8321-7e9a6d3fa34a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2.json
new file mode 100644
index 0000000000..3d22bbbaca
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7752c1cb-ba51-4716-8321-7e9a6d3fa34a",
+  "name": "repos_kamontat_java8example",
+  "request": {
+    "url": "/repos/kamontat/Java8Example",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_kamontat_java8example-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4895",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f87bbb29d760b6147c3705d7d07c11ea\"",
+      "Last-Modified": "Mon, 11 Jul 2016 09:52:53 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F366:361D:FDE7C1:12E647D:5D964449"
+    }
+  },
+  "uuid": "7752c1cb-ba51-4716-8321-7e9a6d3fa34a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example_releases_latest-3-838e4d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example_releases_latest-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example_releases_latest-3-838e4d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/repos_kamontat_java8example_releases_latest-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1-53c446.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1-53c446.json
deleted file mode 100644
index ab9e60e4fb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1-53c446.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "53c4464c-df7f-40cd-94d2-72b47c9a4999",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-53c4464c-df7f-40cd-94d2-72b47c9a4999.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F366:361D:FDE7A8:12E646C:5D964449"
-    }
-  },
-  "uuid": "53c4464c-df7f-40cd-94d2-72b47c9a4999",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1.json
new file mode 100644
index 0000000000..f71ef1e480
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/LatestRepositoryNotExist/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "53c4464c-df7f-40cd-94d2-72b47c9a4999",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4897",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F366:361D:FDE7A8:12E646C:5D964449"
+    }
+  },
+  "uuid": "53c4464c-df7f-40cd-94d2-72b47c9a4999",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/orgs_github-api-test-org-cb173af2-c793-444a-acdf-c3850e7afdbe.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/orgs_github-api-test-org-cb173af2-c793-444a-acdf-c3850e7afdbe.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-0a4d7a1a-f99c-47ca-840a-3e920c18bd1f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-0a4d7a1a-f99c-47ca-840a-3e920c18bd1f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-1c529d7c-99f0-43ae-8231-044f48beac1a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-1c529d7c-99f0-43ae-8231-044f48beac1a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/user-7f6e9a01-5bfa-4f72-9947-07df902f56c3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/user-7f6e9a01-5bfa-4f72-9947-07df902f56c3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2-cb173a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2-cb173a.json
deleted file mode 100644
index 41d0082aaa..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2-cb173a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cb173af2-c793-444a-acdf-c3850e7afdbe",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-cb173af2-c793-444a-acdf-c3850e7afdbe.json",
-    "headers": {
-      "Date": "Wed, 25 Sep 2019 23:35:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4989",
-      "X-RateLimit-Reset": "1569457884",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F855:59E1:1397ED7:171400E:5D8BF9DE"
-    }
-  },
-  "uuid": "cb173af2-c793-444a-acdf-c3850e7afdbe",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..2ebbbd8876
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "cb173af2-c793-444a-acdf-c3850e7afdbe",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 25 Sep 2019 23:35:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4989",
+      "X-RateLimit-Reset": "1569457884",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F855:59E1:1397ED7:171400E:5D8BF9DE"
+    }
+  },
+  "uuid": "cb173af2-c793-444a-acdf-c3850e7afdbe",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3-0a4d7a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3-0a4d7a.json
deleted file mode 100644
index 6956dc4fa8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3-0a4d7a.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "0a4d7a1a-f99c-47ca-840a-3e920c18bd1f",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-0a4d7a1a-f99c-47ca-840a-3e920c18bd1f.json",
-    "headers": {
-      "Date": "Wed, 25 Sep 2019 23:35:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4988",
-      "X-RateLimit-Reset": "1569457884",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0678d1c39ea574f68cc0fb330b067cb7\"",
-      "Last-Modified": "Wed, 25 Sep 2019 23:32:35 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F855:59E1:1397EEB:1714029:5D8BF9DE"
-    }
-  },
-  "uuid": "0a4d7a1a-f99c-47ca-840a-3e920c18bd1f",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..ff4fea1560
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "0a4d7a1a-f99c-47ca-840a-3e920c18bd1f",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Wed, 25 Sep 2019 23:35:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1569457884",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0678d1c39ea574f68cc0fb330b067cb7\"",
+      "Last-Modified": "Wed, 25 Sep 2019 23:32:35 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F855:59E1:1397EEB:1714029:5D8BF9DE"
+    }
+  },
+  "uuid": "0a4d7a1a-f99c-47ca-840a-3e920c18bd1f",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4-2c69d5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4-2c69d5.json
deleted file mode 100644
index d5455b4b0a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4-2c69d5.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"archived\":\"true\",\"name\":\"github-api\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd.json",
-    "headers": {
-      "Date": "Wed, 25 Sep 2019 23:35:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "1569457884",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e40487cafd3670c0de171f4250dbefb8\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F855:59E1:1397F0E:1714041:5D8BF9DE"
-    }
-  },
-  "uuid": "2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4.json
new file mode 100644
index 0000000000..a8243a9fe7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"archived\":\"true\",\"name\":\"github-api\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "Wed, 25 Sep 2019 23:35:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1569457884",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e40487cafd3670c0de171f4250dbefb8\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F855:59E1:1397F0E:1714041:5D8BF9DE"
+    }
+  },
+  "uuid": "2c69d5c8-dd81-4204-bad9-ee37f5b0ebfd",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5-1c529d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5-1c529d.json
deleted file mode 100644
index 9026b7c7f4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5-1c529d.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "1c529d7c-99f0-43ae-8231-044f48beac1a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1c529d7c-99f0-43ae-8231-044f48beac1a.json",
-    "headers": {
-      "Date": "Wed, 25 Sep 2019 23:35:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "1569457884",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e40487cafd3670c0de171f4250dbefb8\"",
-      "Last-Modified": "Wed, 25 Sep 2019 23:35:59 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F855:59E1:1397F42:1714091:5D8BF9DF"
-    }
-  },
-  "uuid": "1c529d7c-99f0-43ae-8231-044f48beac1a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..b4d227346f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,50 @@
+{
+  "id": "1c529d7c-99f0-43ae-8231-044f48beac1a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Wed, 25 Sep 2019 23:35:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1569457884",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e40487cafd3670c0de171f4250dbefb8\"",
+      "Last-Modified": "Wed, 25 Sep 2019 23:35:59 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F855:59E1:1397F42:1714091:5D8BF9DF"
+    }
+  },
+  "uuid": "1c529d7c-99f0-43ae-8231-044f48beac1a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1-7f6e9a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1-7f6e9a.json
deleted file mode 100644
index 06d3a30c72..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1-7f6e9a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7f6e9a01-5bfa-4f72-9947-07df902f56c3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-7f6e9a01-5bfa-4f72-9947-07df902f56c3.json",
-    "headers": {
-      "Date": "Wed, 25 Sep 2019 23:35:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1569457884",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F845:5D1D:FFA88A:12FE539:5D8BF9C5"
-    }
-  },
-  "uuid": "7f6e9a01-5bfa-4f72-9947-07df902f56c3",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1.json
new file mode 100644
index 0000000000..4825653837
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/archive/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "7f6e9a01-5bfa-4f72-9947-07df902f56c3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 25 Sep 2019 23:35:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1569457884",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F845:5D1D:FFA88A:12FE539:5D8BF9C5"
+    }
+  },
+  "uuid": "7f6e9a01-5bfa-4f72-9947-07df902f56c3",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/repos_github-api-test-org_temp-checkstargazerscount-bd22f750-1a7c-4274-b5d6-9e2164a1eb2a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/repos_github-api-test-org_temp-checkstargazerscount-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/repos_github-api-test-org_temp-checkstargazerscount-bd22f750-1a7c-4274-b5d6-9e2164a1eb2a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/repos_github-api-test-org_temp-checkstargazerscount-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/user-ebb96197-f82b-4a05-87e8-932107fd594e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/user-ebb96197-f82b-4a05-87e8-932107fd594e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2-bd22f7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2-bd22f7.json
deleted file mode 100644
index 5736687456..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2-bd22f7.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "bd22f750-1a7c-4274-b5d6-9e2164a1eb2a",
-  "name": "repos_github-api-test-org_temp-checkstargazerscount",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-checkStargazersCount",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-checkstargazerscount-bd22f750-1a7c-4274-b5d6-9e2164a1eb2a.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Thu, 23 Jan 2020 19:16:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4920",
-      "X-RateLimit-Reset": "1579808711",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"f30e5b1563a06b458b3e7337252b42c1\"",
-      "Last-Modified": "Thu, 23 Jan 2020 19:16:20 GMT",
-      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDD6:6F1D:4BF06C:BD9B80:5E29F0FF"
-    }
-  },
-  "uuid": "bd22f750-1a7c-4274-b5d6-9e2164a1eb2a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2.json
new file mode 100644
index 0000000000..5ad9b70ba6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/repos_github-api-test-org_temp-checkstargazerscount-2.json
@@ -0,0 +1,45 @@
+{
+  "id": "bd22f750-1a7c-4274-b5d6-9e2164a1eb2a",
+  "name": "repos_github-api-test-org_temp-checkstargazerscount",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-checkStargazersCount",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-checkstargazerscount-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Thu, 23 Jan 2020 19:16:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4920",
+      "X-RateLimit-Reset": "1579808711",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"f30e5b1563a06b458b3e7337252b42c1\"",
+      "Last-Modified": "Thu, 23 Jan 2020 19:16:20 GMT",
+      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDD6:6F1D:4BF06C:BD9B80:5E29F0FF"
+    }
+  },
+  "uuid": "bd22f750-1a7c-4274-b5d6-9e2164a1eb2a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1-ebb961.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1-ebb961.json
deleted file mode 100644
index 4c8fadf7ce..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1-ebb961.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "ebb96197-f82b-4a05-87e8-932107fd594e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ebb96197-f82b-4a05-87e8-932107fd594e.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Thu, 23 Jan 2020 19:16:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4925",
-      "X-RateLimit-Reset": "1579808711",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"12d1d56c145aab04375c00af287e9ef0\"",
-      "Last-Modified": "Fri, 10 Jan 2020 13:31:02 GMT",
-      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDD6:6F1D:4BEF7C:BD9B79:5E29F0FF"
-    }
-  },
-  "uuid": "ebb96197-f82b-4a05-87e8-932107fd594e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1.json
new file mode 100644
index 0000000000..038a21101e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkStargazersCount/mappings/user-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "ebb96197-f82b-4a05-87e8-932107fd594e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Thu, 23 Jan 2020 19:16:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4925",
+      "X-RateLimit-Reset": "1579808711",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"12d1d56c145aab04375c00af287e9ef0\"",
+      "Last-Modified": "Fri, 10 Jan 2020 13:31:02 GMT",
+      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDD6:6F1D:4BEF7C:BD9B79:5E29F0FF"
+    }
+  },
+  "uuid": "ebb96197-f82b-4a05-87e8-932107fd594e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/repos_github-api-test-org_temp-checkwatcherscount-480b7f68-9bb9-4443-b01f-d617b71fd015.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/repos_github-api-test-org_temp-checkwatcherscount-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/repos_github-api-test-org_temp-checkwatcherscount-480b7f68-9bb9-4443-b01f-d617b71fd015.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/repos_github-api-test-org_temp-checkwatcherscount-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/user-0f326a28-7b63-4439-b05b-645236cafd19.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/user-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/user-0f326a28-7b63-4439-b05b-645236cafd19.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/__files/user-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1-05a87d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1-05a87d.json
deleted file mode 100644
index a902c601cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1-05a87d.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "05a87d46-e21e-4b39-90fa-9ecf2906e550",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-05a87d46-e21e-4b39-90fa-9ecf2906e550.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 21 Jan 2020 18:17:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "25",
-      "X-RateLimit-Reset": "1579634247",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": "Accept",
-      "ETag": "W/\"344d9b542c3151b1973817461b0b7c48\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FB78:0DBB:5534D2:AEDB99:5E27403B"
-    }
-  },
-  "uuid": "05a87d46-e21e-4b39-90fa-9ecf2906e550",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1.json
new file mode 100644
index 0000000000..74ace42438
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/orgs_github-api-test-org-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "05a87d46-e21e-4b39-90fa-9ecf2906e550",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 21 Jan 2020 18:17:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "25",
+      "X-RateLimit-Reset": "1579634247",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": "Accept",
+      "ETag": "W/\"344d9b542c3151b1973817461b0b7c48\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FB78:0DBB:5534D2:AEDB99:5E27403B"
+    }
+  },
+  "uuid": "05a87d46-e21e-4b39-90fa-9ecf2906e550",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2-480b7f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2-480b7f.json
deleted file mode 100644
index e0b0e2d94f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2-480b7f.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "480b7f68-9bb9-4443-b01f-d617b71fd015",
-  "name": "repos_github-api-test-org_temp-checkwatcherscount",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-checkWatchersCount",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-checkwatcherscount-480b7f68-9bb9-4443-b01f-d617b71fd015.json",
-    "headers": {
-      "Date": "Thu, 23 Jan 2020 19:15:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4928",
-      "X-RateLimit-Reset": "1579808711",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0f221fe32212e39d2028da930db55d9f\"",
-      "Last-Modified": "Thu, 23 Jan 2020 19:15:50 GMT",
-      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDCA:20D3:4C9169:BDFFB4:5E29F0E1"
-    }
-  },
-  "uuid": "480b7f68-9bb9-4443-b01f-d617b71fd015",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2.json
new file mode 100644
index 0000000000..57c54e7781
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/repos_github-api-test-org_temp-checkwatcherscount-2.json
@@ -0,0 +1,49 @@
+{
+  "id": "480b7f68-9bb9-4443-b01f-d617b71fd015",
+  "name": "repos_github-api-test-org_temp-checkwatcherscount",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-checkWatchersCount",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-checkwatcherscount-2.json",
+    "headers": {
+      "Date": "Thu, 23 Jan 2020 19:15:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4928",
+      "X-RateLimit-Reset": "1579808711",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0f221fe32212e39d2028da930db55d9f\"",
+      "Last-Modified": "Thu, 23 Jan 2020 19:15:50 GMT",
+      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDCA:20D3:4C9169:BDFFB4:5E29F0E1"
+    }
+  },
+  "uuid": "480b7f68-9bb9-4443-b01f-d617b71fd015",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3-0f326a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3-0f326a.json
deleted file mode 100644
index 93fb07e81f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3-0f326a.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "0f326a28-7b63-4439-b05b-645236cafd19",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-0f326a28-7b63-4439-b05b-645236cafd19.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Sun, 02 Feb 2020 04:29:51 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "1580620984",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"275d33915a65ed3fa77d5fed34147440\"",
-      "Last-Modified": "Sun, 02 Feb 2020 04:15:35 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "C819:07AB:4E26A4:A432C4:5E36503F"
-    }
-  },
-  "uuid": "0f326a28-7b63-4439-b05b-645236cafd19",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3.json
new file mode 100644
index 0000000000..82647a149b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/checkWatchersCount/mappings/user-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "0f326a28-7b63-4439-b05b-645236cafd19",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Sun, 02 Feb 2020 04:29:51 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "1580620984",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"275d33915a65ed3fa77d5fed34147440\"",
+      "Last-Modified": "Sun, 02 Feb 2020 04:15:35 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "C819:07AB:4E26A4:A432C4:5E36503F"
+    }
+  },
+  "uuid": "0f326a28-7b63-4439-b05b-645236cafd19",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/orgs_github-api-test-org-cadf65cc-4434-4d3a-b4cf-4b1b79272f46.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/orgs_github-api-test-org-cadf65cc-4434-4d3a-b4cf-4b1b79272f46.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/repos_github-api-test-org_github-api-228f0322-215d-487e-9132-17bc4c3bf020.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/repos_github-api-test-org_github-api-228f0322-215d-487e-9132-17bc4c3bf020.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/user-87afc711-0c63-4cc6-96b5-26eb391105de.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/user-87afc711-0c63-4cc6-96b5-26eb391105de.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2-cadf65.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2-cadf65.json
deleted file mode 100644
index c0b0c34f87..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2-cadf65.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "cadf65cc-4434-4d3a-b4cf-4b1b79272f46",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-cadf65cc-4434-4d3a-b4cf-4b1b79272f46.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 13 Nov 2019 19:55:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1573678486",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"46db056d052e79900ccf2bffefb0e863\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3E5:680D:1B5AF:4044E:5DCC5FBB"
-    }
-  },
-  "uuid": "cadf65cc-4434-4d3a-b4cf-4b1b79272f46",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..7c2f683c53
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,45 @@
+{
+  "id": "cadf65cc-4434-4d3a-b4cf-4b1b79272f46",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 13 Nov 2019 19:55:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4976",
+      "X-RateLimit-Reset": "1573678486",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"46db056d052e79900ccf2bffefb0e863\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3E5:680D:1B5AF:4044E:5DCC5FBB"
+    }
+  },
+  "uuid": "cadf65cc-4434-4d3a-b4cf-4b1b79272f46",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3-228f03.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3-228f03.json
deleted file mode 100644
index c9e4758687..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3-228f03.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "228f0322-215d-487e-9132-17bc4c3bf020",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-228f0322-215d-487e-9132-17bc4c3bf020.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 13 Nov 2019 19:55:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1573678486",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"30a14752ec6a3eede9a30843cc286a50\"",
-      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
-      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3E5:680D:1B5B8:4048B:5DCC5FBC"
-    }
-  },
-  "uuid": "228f0322-215d-487e-9132-17bc4c3bf020",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..4d28ac43e2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "228f0322-215d-487e-9132-17bc4c3bf020",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 13 Nov 2019 19:55:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1573678486",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"30a14752ec6a3eede9a30843cc286a50\"",
+      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
+      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3E5:680D:1B5B8:4048B:5DCC5FBC"
+    }
+  },
+  "uuid": "228f0322-215d-487e-9132-17bc4c3bf020",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4-b14df6.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/repos_github-api-test-org_github-api_branches_test_nonexistent-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1-87afc7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1-87afc7.json
deleted file mode 100644
index 0584f40e16..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1-87afc7.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "87afc711-0c63-4cc6-96b5-26eb391105de",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-87afc711-0c63-4cc6-96b5-26eb391105de.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 13 Nov 2019 19:55:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "1573678486",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"38c5719328738c2ec6c612f367ae1b59\"",
-      "Last-Modified": "Tue, 23 Jul 2019 14:01:42 GMT",
-      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F3E5:680D:1B592:40447:5DCC5FBB"
-    }
-  },
-  "uuid": "87afc711-0c63-4cc6-96b5-26eb391105de",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1.json
new file mode 100644
index 0000000000..1c801bc206
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranchNonExistentBut200Status/mappings/user-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "87afc711-0c63-4cc6-96b5-26eb391105de",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 13 Nov 2019 19:55:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "1573678486",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"38c5719328738c2ec6c612f367ae1b59\"",
+      "Last-Modified": "Tue, 23 Jul 2019 14:01:42 GMT",
+      "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F3E5:680D:1B592:40447:5DCC5FBB"
+    }
+  },
+  "uuid": "87afc711-0c63-4cc6-96b5-26eb391105de",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api_branches_test_urlencode-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api_branches_test_urlencode-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api_branches_test_urlencode-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/repos_github-api-test-org_github-api_branches_test_urlencode-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2-5e8ae8.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2-5e8ae8.json
deleted file mode 100644
index 6383a4eae5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2-5e8ae8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
-    }
-  },
-  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..cfe78feffc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
+    }
+  },
+  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3-30364e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3-30364e.json
deleted file mode 100644
index dda61603aa..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3-30364e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
-      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
-    }
-  },
-  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..3584665077
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
+      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
+    }
+  },
+  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json
deleted file mode 100644
index fa467016a5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4-ed8bf5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "name": "repos_github-api-test-org_github-api_branches_test_urlencode",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/branches/test/%23UrlEncode",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_urlencode-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
-    }
-  },
-  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4.json
new file mode 100644
index 0000000000..05b227f1e2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/repos_github-api-test-org_github-api_branches_test_urlencode-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "name": "repos_github-api-test-org_github-api_branches_test_urlencode",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/branches/test/%23UrlEncode",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_urlencode-4.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
+    }
+  },
+  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1-c92cdb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1-c92cdb.json
deleted file mode 100644
index 70c3d22112..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1-c92cdb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
-    }
-  },
-  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1.json
new file mode 100644
index 0000000000..b0454fd367
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getBranch_URLEncoded/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
+    }
+  },
+  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/orgs_github-api-5d8b3f90-4fb5-4321-b979-b06127d19224.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/orgs_github-api-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/orgs_github-api-5d8b3f90-4fb5-4321-b979-b06127d19224.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/orgs_github-api-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api-71c75ce1-402c-4835-8841-f1707d28d88d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api-71c75ce1-402c-4835-8841-f1707d28d88d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6f217f80-e2fa-4a54-b6ab-b110055d776a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6f217f80-e2fa-4a54-b6ab-b110055d776a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-797b1c78-fa26-490b-84c8-bd33b21dc7f7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-797b1c78-fa26-490b-84c8-bd33b21dc7f7.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-1787eed0-2420-4fc6-84b7-7a36b96580b5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-1787eed0-2420-4fc6-84b7-7a36b96580b5.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-2c64ebec-78aa-4073-86be-689da8b5914a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-2c64ebec-78aa-4073-86be-689da8b5914a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/__files/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1-5d8b3f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1-5d8b3f.json
deleted file mode 100644
index 1b99efcac3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1-5d8b3f.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "5d8b3f90-4fb5-4321-b979-b06127d19224",
-  "name": "orgs_github-api",
-  "request": {
-    "url": "/orgs/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-5d8b3f90-4fb5-4321-b979-b06127d19224.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "39",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"ecb2a1373168a8fb973e115a07230ce6\"",
-      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA263:12C841D:5E739BB0"
-    }
-  },
-  "uuid": "5d8b3f90-4fb5-4321-b979-b06127d19224",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1.json
new file mode 100644
index 0000000000..0951f9d2d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/orgs_github-api-1.json
@@ -0,0 +1,44 @@
+{
+  "id": "5d8b3f90-4fb5-4321-b979-b06127d19224",
+  "name": "orgs_github-api",
+  "request": {
+    "url": "/orgs/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-1.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "39",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"ecb2a1373168a8fb973e115a07230ce6\"",
+      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA263:12C841D:5E739BB0"
+    }
+  },
+  "uuid": "5d8b3f90-4fb5-4321-b979-b06127d19224",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2-71c75c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2-71c75c.json
deleted file mode 100644
index 263956cc5e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2-71c75c.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "71c75ce1-402c-4835-8841-f1707d28d88d",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-71c75ce1-402c-4835-8841-f1707d28d88d.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "38",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"f33ae8fda7c258c7081ddff5ca75c272\"",
-      "Last-Modified": "Thu, 19 Mar 2020 06:29:25 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA2E4:12C845E:5E739BB1"
-    }
-  },
-  "uuid": "71c75ce1-402c-4835-8841-f1707d28d88d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..ba9c32613f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,44 @@
+{
+  "id": "71c75ce1-402c-4835-8841-f1707d28d88d",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "38",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"f33ae8fda7c258c7081ddff5ca75c272\"",
+      "Last-Modified": "Thu, 19 Mar 2020 06:29:25 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA2E4:12C845E:5E739BB1"
+    }
+  },
+  "uuid": "71c75ce1-402c-4835-8841-f1707d28d88d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3-6f217f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3-6f217f.json
deleted file mode 100644
index a4da0dd255..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3-6f217f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "6f217f80-e2fa-4a54-b6ab-b110055d776a",
-  "name": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.antiope-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6f217f80-e2fa-4a54-b6ab-b110055d776a.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "37",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"5c7ad916e0537e392ec3722c55925cf1\"",
-      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA319:12C84FD:5E739BB1",
-      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\""
-    }
-  },
-  "uuid": "6f217f80-e2fa-4a54-b6ab-b110055d776a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json
new file mode 100644
index 0000000000..51ffb9feb3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "6f217f80-e2fa-4a54-b6ab-b110055d776a",
+  "name": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.antiope-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-3.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "37",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"5c7ad916e0537e392ec3722c55925cf1\"",
+      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA319:12C84FD:5E739BB1",
+      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\""
+    }
+  },
+  "uuid": "6f217f80-e2fa-4a54-b6ab-b110055d776a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4-f57cb1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4-f57cb1.json
deleted file mode 100644
index 6c4c8dbbb4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4-f57cb1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f",
-  "name": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.antiope-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "36",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"5c7ad916e0537e392ec3722c55925cf1\"",
-      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA357:12C854E:5E739BB1",
-      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\""
-    }
-  },
-  "uuid": "f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs",
-  "requiredScenarioState": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json
new file mode 100644
index 0000000000..c13e14bc4b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f",
+  "name": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.antiope-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-4.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "36",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"5c7ad916e0537e392ec3722c55925cf1\"",
+      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA357:12C854E:5E739BB1",
+      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\""
+    }
+  },
+  "uuid": "f57cb1d4-4b6d-4f95-9d39-977d82bbdd6f",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs",
+  "requiredScenarioState": "scenario-1-repos-github-api-github-api-commits-78b9ff49d47daaa158eb373c4e2e040f739df8b9-check-runs-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5-797b1c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5-797b1c.json
deleted file mode 100644
index ff4eb398cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5-797b1c.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "797b1c78-fa26-490b-84c8-bd33b21dc7f7",
-  "name": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
-  "request": {
-    "url": "/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.antiope-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-797b1c78-fa26-490b-84c8-bd33b21dc7f7.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "35",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"22040f1bbc4c4aeaee4a1f56379fc6d4\"",
-      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA3E7:12C8610:5E739BB2",
-      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"prev\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=3>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "797b1c78-fa26-490b-84c8-bd33b21dc7f7",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json
new file mode 100644
index 0000000000..5cb1c84aa4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json
@@ -0,0 +1,44 @@
+{
+  "id": "797b1c78-fa26-490b-84c8-bd33b21dc7f7",
+  "name": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
+  "request": {
+    "url": "/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.antiope-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-5.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "35",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"22040f1bbc4c4aeaee4a1f56379fc6d4\"",
+      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA3E7:12C8610:5E739BB2",
+      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"prev\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=3>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "797b1c78-fa26-490b-84c8-bd33b21dc7f7",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6-1787ee.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6-1787ee.json
deleted file mode 100644
index bbfa90adc4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6-1787ee.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "1787eed0-2420-4fc6-84b7-7a36b96580b5",
-  "name": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
-  "request": {
-    "url": "/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.antiope-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-1787eed0-2420-4fc6-84b7-7a36b96580b5.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "34",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a934b2e696c0fe16e8c65304c51fc41e\"",
-      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA459:12C8695:5E739BB2",
-      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2>; rel=\"prev\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1787eed0-2420-4fc6-84b7-7a36b96580b5",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json
new file mode 100644
index 0000000000..943bbb9f96
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json
@@ -0,0 +1,44 @@
+{
+  "id": "1787eed0-2420-4fc6-84b7-7a36b96580b5",
+  "name": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
+  "request": {
+    "url": "/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.antiope-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-6.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "34",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a934b2e696c0fe16e8c65304c51fc41e\"",
+      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA459:12C8695:5E739BB2",
+      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=2>; rel=\"prev\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"next\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4>; rel=\"last\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1787eed0-2420-4fc6-84b7-7a36b96580b5",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7-2c64eb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7-2c64eb.json
deleted file mode 100644
index 0fdb672166..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7-2c64eb.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "2c64ebec-78aa-4073-86be-689da8b5914a",
-  "name": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
-  "request": {
-    "url": "/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.antiope-preview+json"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-2c64ebec-78aa-4073-86be-689da8b5914a.json",
-    "headers": {
-      "Date": "Thu, 19 Mar 2020 16:20:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "33",
-      "X-RateLimit-Reset": "1584637771",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"677a878b33bbf484fdba9c2572e50cbd\"",
-      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BDDE:30E5B:FEA4E9:12C8752:5E739BB3",
-      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=3>; rel=\"prev\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "2c64ebec-78aa-4073-86be-689da8b5914a",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json
new file mode 100644
index 0000000000..c8610ba364
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCheckRuns/mappings/repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json
@@ -0,0 +1,44 @@
+{
+  "id": "2c64ebec-78aa-4073-86be-689da8b5914a",
+  "name": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs",
+  "request": {
+    "url": "/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.antiope-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_617210_commits_78b9ff49d47daaa158eb373c4e2e040f739df8b9_check-runs-7.json",
+    "headers": {
+      "Date": "Thu, 19 Mar 2020 16:20:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "33",
+      "X-RateLimit-Reset": "1584637771",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"677a878b33bbf484fdba9c2572e50cbd\"",
+      "X-GitHub-Media-Type": "github.antiope-preview; format=json",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BDDE:30E5B:FEA4E9:12C8752:5E739BB3",
+      "Link": "<https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=3>; rel=\"prev\", <https://api.github.com/repositories/617210/commits/78b9ff49d47daaa158eb373c4e2e040f739df8b9/check-runs?per_page=2&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "2c64ebec-78aa-4073-86be-689da8b5914a",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/orgs_github-api-test-org-d319a11c-9dce-4642-a18a-175f6cdbde6d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/orgs_github-api-test-org-d319a11c-9dce-4642-a18a-175f6cdbde6d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api-4c1e8c73-a989-4625-8582-5fa6a2f88f4d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api-4c1e8c73-a989-4625-8582-5fa6a2f88f4d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api_collaborators-2b8badfb-52b8-4304-a9a5-66b80274e93d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api_collaborators-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api_collaborators-2b8badfb-52b8-4304-a9a5-66b80274e93d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/repos_github-api-test-org_github-api_collaborators-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/user-1fc40d28-9354-4587-884e-cf24228c088a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/user-1fc40d28-9354-4587-884e-cf24228c088a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2-d319a1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2-d319a1.json
deleted file mode 100644
index d9b9a02255..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2-d319a1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d319a11c-9dce-4642-a18a-175f6cdbde6d",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-d319a11c-9dce-4642-a18a-175f6cdbde6d.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4956",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1de516fab0228945881043c1bc527c88\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A585:3D530:D2A1AF3:FAB1EAD:5DE7E7C5"
-    }
-  },
-  "uuid": "d319a11c-9dce-4642-a18a-175f6cdbde6d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..653c4423b8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "d319a11c-9dce-4642-a18a-175f6cdbde6d",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1de516fab0228945881043c1bc527c88\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A585:3D530:D2A1AF3:FAB1EAD:5DE7E7C5"
+    }
+  },
+  "uuid": "d319a11c-9dce-4642-a18a-175f6cdbde6d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3-4c1e8c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3-4c1e8c.json
deleted file mode 100644
index 74a6ef0a79..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3-4c1e8c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4c1e8c73-a989-4625-8582-5fa6a2f88f4d",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-4c1e8c73-a989-4625-8582-5fa6a2f88f4d.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4955",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bd13c31938217e87f61c9a08bd0fe01d\"",
-      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A585:3D530:D2A1B48:FAB201E:5DE7E7C6"
-    }
-  },
-  "uuid": "4c1e8c73-a989-4625-8582-5fa6a2f88f4d",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..e6e06011b6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "4c1e8c73-a989-4625-8582-5fa6a2f88f4d",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4955",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bd13c31938217e87f61c9a08bd0fe01d\"",
+      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A585:3D530:D2A1B48:FAB201E:5DE7E7C6"
+    }
+  },
+  "uuid": "4c1e8c73-a989-4625-8582-5fa6a2f88f4d",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-2b8bad.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-2b8bad.json
deleted file mode 100644
index d53f46b389..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-2b8bad.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "2b8badfb-52b8-4304-a9a5-66b80274e93d",
-  "name": "repos_github-api-test-org_github-api_collaborators",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/collaborators",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_collaborators-2b8badfb-52b8-4304-a9a5-66b80274e93d.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f8dbc836966a9d2b4080c9442ef4339\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A585:3D530:D2A1BD1:FAB20AC:5DE7E7C7"
-    }
-  },
-  "uuid": "2b8badfb-52b8-4304-a9a5-66b80274e93d",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json
new file mode 100644
index 0000000000..be041a9c1c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "2b8badfb-52b8-4304-a9a5-66b80274e93d",
+  "name": "repos_github-api-test-org_github-api_collaborators",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/collaborators",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_collaborators-4.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f8dbc836966a9d2b4080c9442ef4339\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A585:3D530:D2A1BD1:FAB20AC:5DE7E7C7"
+    }
+  },
+  "uuid": "2b8badfb-52b8-4304-a9a5-66b80274e93d",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1-1fc40d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1-1fc40d.json
deleted file mode 100644
index 92b9e3b0f3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1-1fc40d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1fc40d28-9354-4587-884e-cf24228c088a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1fc40d28-9354-4587-884e-cf24228c088a.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4958",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"120f406a3c8014eb0bcbd531eab5a54a\"",
-      "Last-Modified": "Mon, 02 Dec 2019 20:08:02 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A585:3D530:D2A19BA:FAB1E5F:5DE7E7C5"
-    }
-  },
-  "uuid": "1fc40d28-9354-4587-884e-cf24228c088a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1.json
new file mode 100644
index 0000000000..649a32a0c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getCollaborators/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1fc40d28-9354-4587-884e-cf24228c088a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4958",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"120f406a3c8014eb0bcbd531eab5a54a\"",
+      "Last-Modified": "Mon, 02 Dec 2019 20:08:02 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A585:3D530:D2A19BA:FAB1E5F:5DE7E7C5"
+    }
+  },
+  "uuid": "1fc40d28-9354-4587-884e-cf24228c088a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/orgs_github-api-test-org-94de530c-025f-4dae-b829-8a7b7ea73c4b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/orgs_github-api-test-org-94de530c-025f-4dae-b829-8a7b7ea73c4b.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-99deb429-da7c-4f6c-9d82-b7e637586210.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-99deb429-da7c-4f6c-9d82-b7e637586210.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/user-98b2b906-bc8f-4f1c-9077-87f686c19718.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/user-98b2b906-bc8f-4f1c-9077-87f686c19718.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-94de53.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-94de53.json
deleted file mode 100644
index 59da86fc59..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-94de53.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "94de530c-025f-4dae-b829-8a7b7ea73c4b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-94de530c-025f-4dae-b829-8a7b7ea73c4b.json",
-    "headers": {
-      "Date": "Mon, 17 Feb 2020 09:43:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4232",
-      "X-RateLimit-Reset": "1581934415",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"e7c7cb36e47554d75f93855cf5c90046\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "1EF4:3DA9:D624B:1255A1:5E4A6035"
-    }
-  },
-  "uuid": "94de530c-025f-4dae-b829-8a7b7ea73c4b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..050eebe619
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "94de530c-025f-4dae-b829-8a7b7ea73c4b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Mon, 17 Feb 2020 09:43:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4232",
+      "X-RateLimit-Reset": "1581934415",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"e7c7cb36e47554d75f93855cf5c90046\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "1EF4:3DA9:D624B:1255A1:5E4A6035"
+    }
+  },
+  "uuid": "94de530c-025f-4dae-b829-8a7b7ea73c4b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-99deb4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-99deb4.json
deleted file mode 100644
index 6d5f457867..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-99deb4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "99deb429-da7c-4f6c-9d82-b7e637586210",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-99deb429-da7c-4f6c-9d82-b7e637586210.json",
-    "headers": {
-      "Date": "Mon, 17 Feb 2020 09:43:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4231",
-      "X-RateLimit-Reset": "1581934416",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"640184c01e642ec2bae0a7caa1722f3c\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "1EF4:3DA9:D624C:1255A2:5E4A6036"
-    }
-  },
-  "uuid": "99deb429-da7c-4f6c-9d82-b7e637586210",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..342774a564
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "99deb429-da7c-4f6c-9d82-b7e637586210",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Mon, 17 Feb 2020 09:43:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4231",
+      "X-RateLimit-Reset": "1581934416",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"640184c01e642ec2bae0a7caa1722f3c\"",
+      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "1EF4:3DA9:D624C:1255A2:5E4A6036"
+    }
+  },
+  "uuid": "99deb429-da7c-4f6c-9d82-b7e637586210",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1-98b2b9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1-98b2b9.json
deleted file mode 100644
index 7f5f2fab9f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1-98b2b9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "98b2b906-bc8f-4f1c-9077-87f686c19718",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-98b2b906-bc8f-4f1c-9077-87f686c19718.json",
-    "headers": {
-      "Date": "Thu, 13 Feb 2020 16:28:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4868",
-      "X-RateLimit-Reset": "1581614535",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"cb9e78930d7aef9b591b0da528f352cb\"",
-      "Last-Modified": "Thu, 13 Feb 2020 16:27:32 GMT",
-      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F579:449D:14F0E1:1B6DD1:5E457931"
-    }
-  },
-  "uuid": "98b2b906-bc8f-4f1c-9077-87f686c19718",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1.json
new file mode 100644
index 0000000000..01704bdd33
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getDeleteBranchOnMerge/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "98b2b906-bc8f-4f1c-9077-87f686c19718",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 13 Feb 2020 16:28:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4868",
+      "X-RateLimit-Reset": "1581614535",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"cb9e78930d7aef9b591b0da528f352cb\"",
+      "Last-Modified": "Thu, 13 Feb 2020 16:27:32 GMT",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F579:449D:14F0E1:1B6DD1:5E457931"
+    }
+  },
+  "uuid": "98b2b906-bc8f-4f1c-9077-87f686c19718",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/orgs_github-api-test-org-793c4cc7-7741-4f8e-b96f-bb0626ce2d51.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/orgs_github-api-test-org-793c4cc7-7741-4f8e-b96f-bb0626ce2d51.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/repos_github-api-test-org_github-api-6352b5c2-d793-4c94-ac5f-9607d6b665f4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/repos_github-api-test-org_github-api-6352b5c2-d793-4c94-ac5f-9607d6b665f4.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/user-d332ba59-878f-47c2-b875-0bb64784cf03.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/user-d332ba59-878f-47c2-b875-0bb64784cf03.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2-793c4c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2-793c4c.json
deleted file mode 100644
index b7efc1bdcc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2-793c4c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "793c4cc7-7741-4f8e-b96f-bb0626ce2d51",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-793c4cc7-7741-4f8e-b96f-bb0626ce2d51.json",
-    "headers": {
-      "Date": "Sat, 14 Mar 2020 15:07:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1584201811",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"d3a6d1a77c4b07aae3e9b04a82656ebb\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "87CC:8D92:62306E8:73BAA7C:5E6CF33E"
-    }
-  },
-  "uuid": "793c4cc7-7741-4f8e-b96f-bb0626ce2d51",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..17567f43ca
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "793c4cc7-7741-4f8e-b96f-bb0626ce2d51",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 14 Mar 2020 15:07:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1584201811",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"d3a6d1a77c4b07aae3e9b04a82656ebb\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "87CC:8D92:62306E8:73BAA7C:5E6CF33E"
+    }
+  },
+  "uuid": "793c4cc7-7741-4f8e-b96f-bb0626ce2d51",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3-6352b5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3-6352b5.json
deleted file mode 100644
index 31b9974b9d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3-6352b5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6352b5c2-d793-4c94-ac5f-9607d6b665f4",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6352b5c2-d793-4c94-ac5f-9607d6b665f4.json",
-    "headers": {
-      "Date": "Sat, 14 Mar 2020 15:07:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1584201811",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"8f1b1f15656de4680f896a990a1feaca\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
-      "X-OAuth-Scopes": "repo, user",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "87CC:8D92:6230718:73BACB4:5E6CF340"
-    }
-  },
-  "uuid": "6352b5c2-d793-4c94-ac5f-9607d6b665f4",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..340bb699dc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6352b5c2-d793-4c94-ac5f-9607d6b665f4",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Sat, 14 Mar 2020 15:07:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1584201811",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"8f1b1f15656de4680f896a990a1feaca\"",
+      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "X-OAuth-Scopes": "repo, user",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "87CC:8D92:6230718:73BACB4:5E6CF340"
+    }
+  },
+  "uuid": "6352b5c2-d793-4c94-ac5f-9607d6b665f4",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4-a9d176.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4-a9d176.json
deleted file mode 100644
index 3a50a0f3d9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4-a9d176.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "a9d176d5-8a1d-452c-932d-1c86182695bc",
-  "name": "repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/statuses/8051615eff597f4e49f4f47625e6fc2b49f26bfc",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-8051615eff597f4e49f4f47625e6fc2b49f26bfc-975c9dbb-4cd0-4ee0-baa4-a2f092e437b6.json",
-    "headers": {
-      "Date": "Sat, 14 Mar 2020 15:07:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1584201810",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "\"4f2c1efa0a5363e128144e5c3014b948\"",
-      "X-OAuth-Scopes": "repo, user",
-      "X-Accepted-OAuth-Scopes": "repo, repo:status",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "87CC:8D92:6230768:73BAD10:5E6CF340"
-    }
-  },
-  "uuid": "a9d176d5-8a1d-452c-932d-1c86182695bc",
-  "persistent": true,
-  "insertionIndex": 4
-}
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4.json
new file mode 100644
index 0000000000..5687cf5795
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "a9d176d5-8a1d-452c-932d-1c86182695bc",
+  "name": "repos_github-api-test-org_github-api_statuses_8051615eff597f4e49f4f47625e6fc2b49f26bfc",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/statuses/8051615eff597f4e49f4f47625e6fc2b49f26bfc",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-8051615eff597f4e49f4f47625e6fc2b49f26bfc-975c9dbb-4cd0-4ee0-baa4-a2f092e437b6.json",
+    "headers": {
+      "Date": "Sat, 14 Mar 2020 15:07:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1584201810",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "\"4f2c1efa0a5363e128144e5c3014b948\"",
+      "X-OAuth-Scopes": "repo, user",
+      "X-Accepted-OAuth-Scopes": "repo, repo:status",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "87CC:8D92:6230768:73BAD10:5E6CF340"
+    }
+  },
+  "uuid": "a9d176d5-8a1d-452c-932d-1c86182695bc",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1-d332ba.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1-d332ba.json
deleted file mode 100644
index dcb61c8057..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1-d332ba.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d332ba59-878f-47c2-b875-0bb64784cf03",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d332ba59-878f-47c2-b875-0bb64784cf03.json",
-    "headers": {
-      "Date": "Sat, 14 Mar 2020 15:07:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1584201810",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"2d7f07ae430e1e01c00f89d0a787b0b5\"",
-      "Last-Modified": "Sat, 14 Mar 2020 12:16:56 GMT",
-      "X-OAuth-Scopes": "repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "87CC:8D92:62304E9:73BAA10:5E6CF33E"
-    }
-  },
-  "uuid": "d332ba59-878f-47c2-b875-0bb64784cf03",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1.json
new file mode 100644
index 0000000000..90a3e350cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getLastCommitStatus/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d332ba59-878f-47c2-b875-0bb64784cf03",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 14 Mar 2020 15:07:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1584201810",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"2d7f07ae430e1e01c00f89d0a787b0b5\"",
+      "Last-Modified": "Sat, 14 Mar 2020 12:16:56 GMT",
+      "X-OAuth-Scopes": "repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "87CC:8D92:62304E9:73BAA10:5E6CF33E"
+    }
+  },
+  "uuid": "d332ba59-878f-47c2-b875-0bb64784cf03",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/repos_github-api-test-org_temp-getmergeoptions-cb893c1a-1c74-4838-b473-342f8c2b8262.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/repos_github-api-test-org_temp-getmergeoptions-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/repos_github-api-test-org_temp-getmergeoptions-cb893c1a-1c74-4838-b473-342f8c2b8262.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/repos_github-api-test-org_temp-getmergeoptions-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/user-5d8fe237-9241-4331-8808-0ca2781e48be.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/user-5d8fe237-9241-4331-8808-0ca2781e48be.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2-cb893c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2-cb893c.json
deleted file mode 100644
index 6c9965cc0c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2-cb893c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cb893c1a-1c74-4838-b473-342f8c2b8262",
-  "name": "repos_github-api-test-org_temp-getmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-getMergeOptions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-getmergeoptions-cb893c1a-1c74-4838-b473-342f8c2b8262.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4779",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8cf8d178089529a31ec118053dfb2e26\"",
-      "Last-Modified": "Wed, 09 Oct 2019 20:35:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC9F:3044:A907C9:1358197:5D9E447F"
-    }
-  },
-  "uuid": "cb893c1a-1c74-4838-b473-342f8c2b8262",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2.json
new file mode 100644
index 0000000000..0b1ffd99a4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/repos_github-api-test-org_temp-getmergeoptions-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "cb893c1a-1c74-4838-b473-342f8c2b8262",
+  "name": "repos_github-api-test-org_temp-getmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-getMergeOptions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-getmergeoptions-2.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4779",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8cf8d178089529a31ec118053dfb2e26\"",
+      "Last-Modified": "Wed, 09 Oct 2019 20:35:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC9F:3044:A907C9:1358197:5D9E447F"
+    }
+  },
+  "uuid": "cb893c1a-1c74-4838-b473-342f8c2b8262",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1-5d8fe2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1-5d8fe2.json
deleted file mode 100644
index 056a61164e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1-5d8fe2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5d8fe237-9241-4331-8808-0ca2781e48be",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-5d8fe237-9241-4331-8808-0ca2781e48be.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4787",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f10545b81d574e5b3170d6ee67e622c7\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC9F:3044:A90701:135818B:5D9E447E"
-    }
-  },
-  "uuid": "5d8fe237-9241-4331-8808-0ca2781e48be",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1.json
new file mode 100644
index 0000000000..97c288969e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getMergeOptions/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "5d8fe237-9241-4331-8808-0ca2781e48be",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4787",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f10545b81d574e5b3170d6ee67e622c7\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC9F:3044:A90701:135818B:5D9E447E"
+    }
+  },
+  "uuid": "5d8fe237-9241-4331-8808-0ca2781e48be",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/orgs_apache-f737f022-de94-4025-89aa-a912b960c50c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/orgs_apache-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/orgs_apache-f737f022-de94-4025-89aa-a912b960c50c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/orgs_apache-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_apache_groovy-cc8d8558-cd64-41fb-bdc6-37ff181eb321.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_apache_groovy-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_apache_groovy-cc8d8558-cd64-41fb-bdc6-37ff181eb321.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_apache_groovy-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission-4976af4f-68c3-4057-a201-3d498f842bd5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission-4976af4f-68c3-4057-a201-3d498f842bd5.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_dude_permission-665c4060-0f62-4490-b41c-88943cc0e008.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_dude_permission-665c4060-0f62-4490-b41c-88943cc0e008.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-8dd9fa47-74b9-42b8-b50e-cb0f13a842fb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-8dd9fa47-74b9-42b8-b50e-cb0f13a842fb.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/user-01e35abe-08e1-4af9-b88b-3a9f87603970.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/user-01e35abe-08e1-4af9-b88b-3a9f87603970.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5-f737f0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5-f737f0.json
deleted file mode 100644
index cb9660aa84..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5-f737f0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f737f022-de94-4025-89aa-a912b960c50c",
-  "name": "orgs_apache",
-  "request": {
-    "url": "/orgs/apache",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_apache-f737f022-de94-4025-89aa-a912b960c50c.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4929",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"601b266d8a980befe3f42915ef4d8096\"",
-      "Last-Modified": "Thu, 12 Sep 2019 14:26:07 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F34D:361D:FDE3C1:12E5FA3:5D964440"
-    }
-  },
-  "uuid": "f737f022-de94-4025-89aa-a912b960c50c",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5.json
new file mode 100644
index 0000000000..5be8708804
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/orgs_apache-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "f737f022-de94-4025-89aa-a912b960c50c",
+  "name": "orgs_apache",
+  "request": {
+    "url": "/orgs/apache",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_apache-5.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4929",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"601b266d8a980befe3f42915ef4d8096\"",
+      "Last-Modified": "Thu, 12 Sep 2019 14:26:07 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F34D:361D:FDE3C1:12E5FA3:5D964440"
+    }
+  },
+  "uuid": "f737f022-de94-4025-89aa-a912b960c50c",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6-cc8d85.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6-cc8d85.json
deleted file mode 100644
index 508ec6cb7c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6-cc8d85.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "cc8d8558-cd64-41fb-bdc6-37ff181eb321",
-  "name": "repos_apache_groovy",
-  "request": {
-    "url": "/repos/apache/groovy",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_apache_groovy-cc8d8558-cd64-41fb-bdc6-37ff181eb321.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:01 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4928",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c0e7fd54085753a51bf79e173ba57221\"",
-      "Last-Modified": "Thu, 03 Oct 2019 17:47:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F34D:361D:FDE3CE:12E5FBE:5D964441"
-    }
-  },
-  "uuid": "cc8d8558-cd64-41fb-bdc6-37ff181eb321",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6.json
new file mode 100644
index 0000000000..a704ddf182
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "cc8d8558-cd64-41fb-bdc6-37ff181eb321",
+  "name": "repos_apache_groovy",
+  "request": {
+    "url": "/repos/apache/groovy",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_apache_groovy-6.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:01 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4928",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c0e7fd54085753a51bf79e173ba57221\"",
+      "Last-Modified": "Thu, 03 Oct 2019 17:47:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F34D:361D:FDE3CE:12E5FBE:5D964441"
+    }
+  },
+  "uuid": "cc8d8558-cd64-41fb-bdc6-37ff181eb321",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy_collaborators_jglick_permission-7-61ff8c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy_collaborators_jglick_permission-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy_collaborators_jglick_permission-7-61ff8c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_apache_groovy_collaborators_jglick_permission-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2-4976af.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2-4976af.json
deleted file mode 100644
index a9ba1a4a7e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2-4976af.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4976af4f-68c3-4057-a201-3d498f842bd5",
-  "name": "repos_github-api-test-org_test-permission",
-  "request": {
-    "url": "/repos/github-api-test-org/test-permission",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-permission-4976af4f-68c3-4057-a201-3d498f842bd5.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"88f53ff51ed20a6591f9711690202081\"",
-      "Last-Modified": "Tue, 10 Jan 2017 00:22:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F34D:361D:FDE381:12E5F33:5D96443F"
-    }
-  },
-  "uuid": "4976af4f-68c3-4057-a201-3d498f842bd5",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2.json
new file mode 100644
index 0000000000..a06203ad92
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4976af4f-68c3-4057-a201-3d498f842bd5",
+  "name": "repos_github-api-test-org_test-permission",
+  "request": {
+    "url": "/repos/github-api-test-org/test-permission",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-permission-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"88f53ff51ed20a6591f9711690202081\"",
+      "Last-Modified": "Tue, 10 Jan 2017 00:22:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F34D:361D:FDE381:12E5F33:5D96443F"
+    }
+  },
+  "uuid": "4976af4f-68c3-4057-a201-3d498f842bd5",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4-665c40.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4-665c40.json
deleted file mode 100644
index 455f4b7a8c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4-665c40.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "665c4060-0f62-4490-b41c-88943cc0e008",
-  "name": "repos_github-api-test-org_test-permission_collaborators_dude_permission",
-  "request": {
-    "url": "/repos/github-api-test-org/test-permission/collaborators/dude/permission",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-permission_collaborators_dude_permission-665c4060-0f62-4490-b41c-88943cc0e008.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5f7a2ed33712680c7d7228a3ccdcfb2f\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F34D:361D:FDE39C:12E5F72:5D964440"
-    }
-  },
-  "uuid": "665c4060-0f62-4490-b41c-88943cc0e008",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json
new file mode 100644
index 0000000000..bd14b9337c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "665c4060-0f62-4490-b41c-88943cc0e008",
+  "name": "repos_github-api-test-org_test-permission_collaborators_dude_permission",
+  "request": {
+    "url": "/repos/github-api-test-org/test-permission/collaborators/dude/permission",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-permission_collaborators_dude_permission-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5f7a2ed33712680c7d7228a3ccdcfb2f\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F34D:361D:FDE39C:12E5F72:5D964440"
+    }
+  },
+  "uuid": "665c4060-0f62-4490-b41c-88943cc0e008",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3-8dd9fa.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3-8dd9fa.json
deleted file mode 100644
index 4c580191ec..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3-8dd9fa.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "8dd9fa47-74b9-42b8-b50e-cb0f13a842fb",
-  "name": "repos_github-api-test-org_test-permission_collaborators_kohsuke_permission",
-  "request": {
-    "url": "/repos/github-api-test-org/test-permission/collaborators/kohsuke/permission",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-8dd9fa47-74b9-42b8-b50e-cb0f13a842fb.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4931",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"02c56ee4cf923b6990fe067d91b50165\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F34D:361D:FDE393:12E5F62:5D964440"
-    }
-  },
-  "uuid": "8dd9fa47-74b9-42b8-b50e-cb0f13a842fb",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json
new file mode 100644
index 0000000000..15982aab2a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "8dd9fa47-74b9-42b8-b50e-cb0f13a842fb",
+  "name": "repos_github-api-test-org_test-permission_collaborators_kohsuke_permission",
+  "request": {
+    "url": "/repos/github-api-test-org/test-permission/collaborators/kohsuke/permission",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_test-permission_collaborators_kohsuke_permission-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"02c56ee4cf923b6990fe067d91b50165\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F34D:361D:FDE393:12E5F62:5D964440"
+    }
+  },
+  "uuid": "8dd9fa47-74b9-42b8-b50e-cb0f13a842fb",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1-01e35a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1-01e35a.json
deleted file mode 100644
index 3312bb8949..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1-01e35a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "01e35abe-08e1-4af9-b88b-3a9f87603970",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-01e35abe-08e1-4af9-b88b-3a9f87603970.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:55:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F34D:361D:FDE357:12E5F22:5D96443F"
-    }
-  },
-  "uuid": "01e35abe-08e1-4af9-b88b-3a9f87603970",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1.json
new file mode 100644
index 0000000000..b001a25be6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPermission/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "01e35abe-08e1-4af9-b88b-3a9f87603970",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:55:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F34D:361D:FDE357:12E5F22:5D96443F"
+    }
+  },
+  "uuid": "01e35abe-08e1-4af9-b88b-3a9f87603970",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/orgs_github-api-test-org-4d7df9f1-02f4-4e5b-af93-17eb8719f528.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/orgs_github-api-test-org-4d7df9f1-02f4-4e5b-af93-17eb8719f528.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/repos_github-api-test-org_github-api-14b99bef-f40b-440a-9e65-c84a53678a8e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/repos_github-api-test-org_github-api-14b99bef-f40b-440a-9e65-c84a53678a8e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/user-bd5a7a15-f398-4c3e-a221-0825bbb912fc.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/user-bd5a7a15-f398-4c3e-a221-0825bbb912fc.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2-4d7df9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2-4d7df9.json
deleted file mode 100644
index 9456bac116..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2-4d7df9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4d7df9f1-02f4-4e5b-af93-17eb8719f528",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-4d7df9f1-02f4-4e5b-af93-17eb8719f528.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1de516fab0228945881043c1bc527c88\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5BF:3BB71:11B8AB3B:151DD77E:5DE7E7ED"
-    }
-  },
-  "uuid": "4d7df9f1-02f4-4e5b-af93-17eb8719f528",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..d6ff42f487
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "4d7df9f1-02f4-4e5b-af93-17eb8719f528",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1de516fab0228945881043c1bc527c88\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5BF:3BB71:11B8AB3B:151DD77E:5DE7E7ED"
+    }
+  },
+  "uuid": "4d7df9f1-02f4-4e5b-af93-17eb8719f528",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3-14b99b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3-14b99b.json
deleted file mode 100644
index ab9cbe0ae1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3-14b99b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "14b99bef-f40b-440a-9e65-c84a53678a8e",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-14b99bef-f40b-440a-9e65-c84a53678a8e.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bd13c31938217e87f61c9a08bd0fe01d\"",
-      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5BF:3BB71:11B8ABA7:151DD94F:5DE7E7EE"
-    }
-  },
-  "uuid": "14b99bef-f40b-440a-9e65-c84a53678a8e",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..47513234cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "14b99bef-f40b-440a-9e65-c84a53678a8e",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bd13c31938217e87f61c9a08bd0fe01d\"",
+      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5BF:3BB71:11B8ABA7:151DD94F:5DE7E7EE"
+    }
+  },
+  "uuid": "14b99bef-f40b-440a-9e65-c84a53678a8e",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api_hooks-4-2b78cc.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api_hooks-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api_hooks-4-2b78cc.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/repos_github-api-test-org_github-api_hooks-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1-bd5a7a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1-bd5a7a.json
deleted file mode 100644
index 026e7ec71c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1-bd5a7a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bd5a7a15-f398-4c3e-a221-0825bbb912fc",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-bd5a7a15-f398-4c3e-a221-0825bbb912fc.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 17:07:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4953",
-      "X-RateLimit-Reset": "1575482837",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"120f406a3c8014eb0bcbd531eab5a54a\"",
-      "Last-Modified": "Mon, 02 Dec 2019 20:08:02 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5BF:3BB71:11B8A9E1:151DD73C:5DE7E7ED"
-    }
-  },
-  "uuid": "bd5a7a15-f398-4c3e-a221-0825bbb912fc",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1.json
new file mode 100644
index 0000000000..6931c18d83
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getPostCommitHooks/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "bd5a7a15-f398-4c3e-a221-0825bbb912fc",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 17:07:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1575482837",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"120f406a3c8014eb0bcbd531eab5a54a\"",
+      "Last-Modified": "Mon, 02 Dec 2019 20:08:02 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5BF:3BB71:11B8A9E1:151DD73C:5DE7E7ED"
+    }
+  },
+  "uuid": "bd5a7a15-f398-4c3e-a221-0825bbb912fc",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs-b801c47d-7365-44a2-84d8-2f6e04bad661.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs-b801c47d-7365-44a2-84d8-2f6e04bad661.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs_git_refs-75f99e25-50ad-4fb0-b82e-91d41c57db5e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs_git_refs-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs_git_refs-75f99e25-50ad-4fb0-b82e-91d41c57db5e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/repos_github-api-test-org_temp-getrefs_git_refs-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/user-5f3cda62-83b0-44c6-8ddb-03e4bf6ada41.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/user-5f3cda62-83b0-44c6-8ddb-03e4bf6ada41.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2-b801c4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2-b801c4.json
deleted file mode 100644
index d4eb841535..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2-b801c4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b801c47d-7365-44a2-84d8-2f6e04bad661",
-  "name": "repos_github-api-test-org_temp-getrefs",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-getRefs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-getrefs-b801c47d-7365-44a2-84d8-2f6e04bad661.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4942",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"45507bef9907ae1d13c69069e4a6b8fe\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:18:20 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F645:2FAE:A2B2CA:C768CA:5E18EA17"
-    }
-  },
-  "uuid": "b801c47d-7365-44a2-84d8-2f6e04bad661",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2.json
new file mode 100644
index 0000000000..1c131bf190
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b801c47d-7365-44a2-84d8-2f6e04bad661",
+  "name": "repos_github-api-test-org_temp-getrefs",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-getRefs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-getrefs-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4942",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"45507bef9907ae1d13c69069e4a6b8fe\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:18:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F645:2FAE:A2B2CA:C768CA:5E18EA17"
+    }
+  },
+  "uuid": "b801c47d-7365-44a2-84d8-2f6e04bad661",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3-75f99e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3-75f99e.json
deleted file mode 100644
index a61d7ee2cb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3-75f99e.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "75f99e25-50ad-4fb0-b82e-91d41c57db5e",
-  "name": "repos_github-api-test-org_temp-getrefs_git_refs",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-getRefs/git/refs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-getrefs_git_refs-75f99e25-50ad-4fb0-b82e-91d41c57db5e.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4941",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1c998598a68542bfb7ad9886b7d5824\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:18:20 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F645:2FAE:A2B2D9:C76A13:5E18EA1D"
-    }
-  },
-  "uuid": "75f99e25-50ad-4fb0-b82e-91d41c57db5e",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3.json
new file mode 100644
index 0000000000..8bc857262b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/repos_github-api-test-org_temp-getrefs_git_refs-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "75f99e25-50ad-4fb0-b82e-91d41c57db5e",
+  "name": "repos_github-api-test-org_temp-getrefs_git_refs",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-getRefs/git/refs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-getrefs_git_refs-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1c998598a68542bfb7ad9886b7d5824\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:18:20 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F645:2FAE:A2B2D9:C76A13:5E18EA1D"
+    }
+  },
+  "uuid": "75f99e25-50ad-4fb0-b82e-91d41c57db5e",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1-5f3cda.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1-5f3cda.json
deleted file mode 100644
index 9bc96a9625..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1-5f3cda.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5f3cda62-83b0-44c6-8ddb-03e4bf6ada41",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-5f3cda62-83b0-44c6-8ddb-03e4bf6ada41.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F645:2FAE:A2B1CA:C768C4:5E18EA17"
-    }
-  },
-  "uuid": "5f3cda62-83b0-44c6-8ddb-03e4bf6ada41",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1.json
new file mode 100644
index 0000000000..8890af175a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefs/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "5f3cda62-83b0-44c6-8ddb-03e4bf6ada41",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4947",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F645:2FAE:A2B1CA:C768C4:5E18EA17"
+    }
+  },
+  "uuid": "5f3cda62-83b0-44c6-8ddb-03e4bf6ada41",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/repos_github-api-test-org_temp-getrefsemptytags-9293d03b-4a5e-43ea-9df2-c419ac3ff3b4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/repos_github-api-test-org_temp-getrefsemptytags-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/repos_github-api-test-org_temp-getrefsemptytags-9293d03b-4a5e-43ea-9df2-c419ac3ff3b4.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/repos_github-api-test-org_temp-getrefsemptytags-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/user-71dacb02-1a7c-4d9a-98bd-30c0891bed64.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/user-71dacb02-1a7c-4d9a-98bd-30c0891bed64.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2-9293d0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2-9293d0.json
deleted file mode 100644
index 9a4f26b5dc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2-9293d0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9293d03b-4a5e-43ea-9df2-c419ac3ff3b4",
-  "name": "repos_github-api-test-org_temp-getrefsemptytags",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-getRefsEmptyTags",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-getrefsemptytags-9293d03b-4a5e-43ea-9df2-c419ac3ff3b4.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b57a73e26fe6e5056bbe88c818d6e15e\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:18:36 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F677:2186:25F74A:2E61A7:5E18EA27"
-    }
-  },
-  "uuid": "9293d03b-4a5e-43ea-9df2-c419ac3ff3b4",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2.json
new file mode 100644
index 0000000000..220490964d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "9293d03b-4a5e-43ea-9df2-c419ac3ff3b4",
+  "name": "repos_github-api-test-org_temp-getrefsemptytags",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-getRefsEmptyTags",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-getrefsemptytags-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b57a73e26fe6e5056bbe88c818d6e15e\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:18:36 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F677:2186:25F74A:2E61A7:5E18EA27"
+    }
+  },
+  "uuid": "9293d03b-4a5e-43ea-9df2-c419ac3ff3b4",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags_git_refs_tags-3-60a3ef.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags_git_refs_tags-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags_git_refs_tags-3-60a3ef.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/repos_github-api-test-org_temp-getrefsemptytags_git_refs_tags-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1-71dacb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1-71dacb.json
deleted file mode 100644
index 178a8b5cc7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1-71dacb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "71dacb02-1a7c-4d9a-98bd-30c0891bed64",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-71dacb02-1a7c-4d9a-98bd-30c0891bed64.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4924",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F677:2186:25F6FB:2E61A3:5E18EA27"
-    }
-  },
-  "uuid": "71dacb02-1a7c-4d9a-98bd-30c0891bed64",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1.json
new file mode 100644
index 0000000000..c0092ab421
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsEmptyTags/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "71dacb02-1a7c-4d9a-98bd-30c0891bed64",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4924",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F677:2186:25F6FB:2E61A3:5E18EA27"
+    }
+  },
+  "uuid": "71dacb02-1a7c-4d9a-98bd-30c0891bed64",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads-7b70f17b-8996-4f3c-b51e-4e185e988ee0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads-7b70f17b-8996-4f3c-b51e-4e185e988ee0.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-95cf2b75-6df1-42ca-93dc-068a4690233c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-95cf2b75-6df1-42ca-93dc-068a4690233c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/user-4d2e3f3e-c3c0-44e6-8000-a0e52f469579.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/user-4d2e3f3e-c3c0-44e6-8000-a0e52f469579.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2-7b70f1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2-7b70f1.json
deleted file mode 100644
index e6033a7944..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2-7b70f1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7b70f17b-8996-4f3c-b51e-4e185e988ee0",
-  "name": "repos_github-api-test-org_temp-getrefsheads",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-getRefsHeads",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-getrefsheads-7b70f17b-8996-4f3c-b51e-4e185e988ee0.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:17:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"263909fd1bc03a2acdd17bc99b04e26b\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:17:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F626:2189:D66144:FFC95F:5E18EA01"
-    }
-  },
-  "uuid": "7b70f17b-8996-4f3c-b51e-4e185e988ee0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2.json
new file mode 100644
index 0000000000..743225f131
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7b70f17b-8996-4f3c-b51e-4e185e988ee0",
+  "name": "repos_github-api-test-org_temp-getrefsheads",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-getRefsHeads",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-getrefsheads-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:17:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"263909fd1bc03a2acdd17bc99b04e26b\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:17:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F626:2189:D66144:FFC95F:5E18EA01"
+    }
+  },
+  "uuid": "7b70f17b-8996-4f3c-b51e-4e185e988ee0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3-95cf2b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3-95cf2b.json
deleted file mode 100644
index 5f05bcfb34..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3-95cf2b.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "95cf2b75-6df1-42ca-93dc-068a4690233c",
-  "name": "repos_github-api-test-org_temp-getrefsheads_git_refs_heads",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-getRefsHeads/git/refs/heads",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-getrefsheads_git_refs_heads-95cf2b75-6df1-42ca-93dc-068a4690233c.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:17:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f2e7076a2ddc26dc295bbed913c594aa\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:17:57 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F626:2189:D6614F:FFCB1E:5E18EA07"
-    }
-  },
-  "uuid": "95cf2b75-6df1-42ca-93dc-068a4690233c",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json
new file mode 100644
index 0000000000..781894e63a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "95cf2b75-6df1-42ca-93dc-068a4690233c",
+  "name": "repos_github-api-test-org_temp-getrefsheads_git_refs_heads",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-getRefsHeads/git/refs/heads",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-getrefsheads_git_refs_heads-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:17:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f2e7076a2ddc26dc295bbed913c594aa\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:17:57 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F626:2189:D6614F:FFCB1E:5E18EA07"
+    }
+  },
+  "uuid": "95cf2b75-6df1-42ca-93dc-068a4690233c",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1-4d2e3f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1-4d2e3f.json
deleted file mode 100644
index c3eb8b1142..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1-4d2e3f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4d2e3f3e-c3c0-44e6-8000-a0e52f469579",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-4d2e3f3e-c3c0-44e6-8000-a0e52f469579.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:17:53 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F626:2189:D65FD2:FFC954:5E18EA01"
-    }
-  },
-  "uuid": "4d2e3f3e-c3c0-44e6-8000-a0e52f469579",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1.json
new file mode 100644
index 0000000000..a7bf062646
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRefsHeads/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "4d2e3f3e-c3c0-44e6-8000-a0e52f469579",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:17:53 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F626:2189:D65FD2:FFC954:5E18EA01"
+    }
+  },
+  "uuid": "4d2e3f3e-c3c0-44e6-8000-a0e52f469579",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/orgs_github-api-test-org-f2bd68e9-de30-4416-a2ed-8674710a5ff7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/orgs_github-api-test-org-f2bd68e9-de30-4416-a2ed-8674710a5ff7.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/repos_github-api-test-org_github-api-c19ba509-63bb-424a-83d7-c308b7d42c35.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/repos_github-api-test-org_github-api-c19ba509-63bb-424a-83d7-c308b7d42c35.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/user-c36cc5db-11f3-4ba4-a6c0-d7b45353121f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/user-c36cc5db-11f3-4ba4-a6c0-d7b45353121f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2-f2bd68.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2-f2bd68.json
deleted file mode 100644
index 935fa03609..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2-f2bd68.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f2bd68e9-de30-4416-a2ed-8674710a5ff7",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-f2bd68e9-de30-4416-a2ed-8674710a5ff7.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4886",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1f1da50f358ccc41c1f6f864b3de2798\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F36C:78ED:14A1D49:188DB68:5D96444B"
-    }
-  },
-  "uuid": "f2bd68e9-de30-4416-a2ed-8674710a5ff7",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..bd7747a5bc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f2bd68e9-de30-4416-a2ed-8674710a5ff7",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4886",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1f1da50f358ccc41c1f6f864b3de2798\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F36C:78ED:14A1D49:188DB68:5D96444B"
+    }
+  },
+  "uuid": "f2bd68e9-de30-4416-a2ed-8674710a5ff7",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3-c19ba5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3-c19ba5.json
deleted file mode 100644
index 9b09a5a3b3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3-c19ba5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c19ba509-63bb-424a-83d7-c308b7d42c35",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-c19ba509-63bb-424a-83d7-c308b7d42c35.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4885",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f2e5ff84c604193d0199f717285eac5e\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F36C:78ED:14A1D64:188DBA1:5D96444B"
-    }
-  },
-  "uuid": "c19ba509-63bb-424a-83d7-c308b7d42c35",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..a019d13b3f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "c19ba509-63bb-424a-83d7-c308b7d42c35",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4885",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f2e5ff84c604193d0199f717285eac5e\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F36C:78ED:14A1D64:188DBA1:5D96444B"
+    }
+  },
+  "uuid": "c19ba509-63bb-424a-83d7-c308b7d42c35",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api_releases_tags_foo-bar-baz-4-3ac213.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api_releases_tags_foo-bar-baz-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api_releases_tags_foo-bar-baz-4-3ac213.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/repos_github-api-test-org_github-api_releases_tags_foo-bar-baz-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1-c36cc5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1-c36cc5.json
deleted file mode 100644
index 0319410a57..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1-c36cc5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c36cc5db-11f3-4ba4-a6c0-d7b45353121f",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c36cc5db-11f3-4ba4-a6c0-d7b45353121f.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4888",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F36C:78ED:14A1D26:188DB55:5D96444B"
-    }
-  },
-  "uuid": "c36cc5db-11f3-4ba4-a6c0-d7b45353121f",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1.json
new file mode 100644
index 0000000000..4df3e0cbe1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameDoesNotExist/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c36cc5db-11f3-4ba4-a6c0-d7b45353121f",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4888",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F36C:78ED:14A1D26:188DB55:5D96444B"
+    }
+  },
+  "uuid": "c36cc5db-11f3-4ba4-a6c0-d7b45353121f",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/orgs_github-8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/orgs_github-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/orgs_github-8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/orgs_github-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub-fc521132-c82c-4c40-a60a-a60b17884999.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub-fc521132-c82c-4c40-a60a-a60b17884999.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub_releases_tags_v230-pre10-dcb217dc-3403-4785-b4cc-72b425ff89bc.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub_releases_tags_v230-pre10-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub_releases_tags_v230-pre10-dcb217dc-3403-4785-b4cc-72b425ff89bc.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/repos_github_hub_releases_tags_v230-pre10-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/user-87c44ef0-9caf-4dcb-b261-9ddd517c941a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/user-87c44ef0-9caf-4dcb-b261-9ddd517c941a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2-8cbc3a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2-8cbc3a.json
deleted file mode 100644
index f0a04f193f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2-8cbc3a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c",
-  "name": "orgs_github",
-  "request": {
-    "url": "/orgs/github",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4913",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
-      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F35D:3CA2:1355F7C:172996A:5D964445"
-    }
-  },
-  "uuid": "8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2.json
new file mode 100644
index 0000000000..4cde723005
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/orgs_github-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c",
+  "name": "orgs_github",
+  "request": {
+    "url": "/orgs/github",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4913",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
+      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F35D:3CA2:1355F7C:172996A:5D964445"
+    }
+  },
+  "uuid": "8cbc3a4c-9afe-4ab9-a5d6-0b375b5d889c",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3-fc5211.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3-fc5211.json
deleted file mode 100644
index 00c1d365a7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3-fc5211.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fc521132-c82c-4c40-a60a-a60b17884999",
-  "name": "repos_github_hub",
-  "request": {
-    "url": "/repos/github/hub",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub-fc521132-c82c-4c40-a60a-a60b17884999.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4912",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
-      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F35D:3CA2:1355F9F:17299C0:5D964445"
-    }
-  },
-  "uuid": "fc521132-c82c-4c40-a60a-a60b17884999",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3.json
new file mode 100644
index 0000000000..827eff1343
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "fc521132-c82c-4c40-a60a-a60b17884999",
+  "name": "repos_github_hub",
+  "request": {
+    "url": "/repos/github/hub",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4912",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
+      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F35D:3CA2:1355F9F:17299C0:5D964445"
+    }
+  },
+  "uuid": "fc521132-c82c-4c40-a60a-a60b17884999",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4-dcb217.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4-dcb217.json
deleted file mode 100644
index 4f1881052a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4-dcb217.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "dcb217dc-3403-4785-b4cc-72b425ff89bc",
-  "name": "repos_github_hub_releases_tags_v230-pre10",
-  "request": {
-    "url": "/repos/github/hub/releases/tags/v2.3.0-pre10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub_releases_tags_v230-pre10-dcb217dc-3403-4785-b4cc-72b425ff89bc.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4911",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"646e273b4cd306db2adb200e942b8b76\"",
-      "Last-Modified": "Mon, 26 Jun 2017 21:26:01 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F35D:3CA2:1355FC5:17299EA:5D964446"
-    }
-  },
-  "uuid": "dcb217dc-3403-4785-b4cc-72b425ff89bc",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4.json
new file mode 100644
index 0000000000..d0c9080c40
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/repos_github_hub_releases_tags_v230-pre10-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "dcb217dc-3403-4785-b4cc-72b425ff89bc",
+  "name": "repos_github_hub_releases_tags_v230-pre10",
+  "request": {
+    "url": "/repos/github/hub/releases/tags/v2.3.0-pre10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub_releases_tags_v230-pre10-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4911",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"646e273b4cd306db2adb200e942b8b76\"",
+      "Last-Modified": "Mon, 26 Jun 2017 21:26:01 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F35D:3CA2:1355FC5:17299EA:5D964446"
+    }
+  },
+  "uuid": "dcb217dc-3403-4785-b4cc-72b425ff89bc",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1-87c44e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1-87c44e.json
deleted file mode 100644
index 7f9d04297e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1-87c44e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "87c44ef0-9caf-4dcb-b261-9ddd517c941a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-87c44ef0-9caf-4dcb-b261-9ddd517c941a.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4915",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F35D:3CA2:1355F36:172994E:5D964445"
-    }
-  },
-  "uuid": "87c44ef0-9caf-4dcb-b261-9ddd517c941a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1.json
new file mode 100644
index 0000000000..1351323901
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseByTagNameExists/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "87c44ef0-9caf-4dcb-b261-9ddd517c941a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4915",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F35D:3CA2:1355F36:172994E:5D964445"
+    }
+  },
+  "uuid": "87c44ef0-9caf-4dcb-b261-9ddd517c941a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/orgs_github-18ee08b2-d3da-40f9-81b1-a4976502dc61.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/orgs_github-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/orgs_github-18ee08b2-d3da-40f9-81b1-a4976502dc61.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/orgs_github-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/repos_github_hub-e0a029ec-a3a9-4f0c-904f-de386dcfbfde.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/repos_github_hub-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/repos_github_hub-e0a029ec-a3a9-4f0c-904f-de386dcfbfde.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/repos_github_hub-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/user-f64c26dc-b35e-4fef-ba8e-6747d1e1f89b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/user-f64c26dc-b35e-4fef-ba8e-6747d1e1f89b.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2-18ee08.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2-18ee08.json
deleted file mode 100644
index 7002a1947a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2-18ee08.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "18ee08b2-d3da-40f9-81b1-a4976502dc61",
-  "name": "orgs_github",
-  "request": {
-    "url": "/orgs/github",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-18ee08b2-d3da-40f9-81b1-a4976502dc61.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
-      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F363:67D5:E0FD09:10F08E1:5D964448"
-    }
-  },
-  "uuid": "18ee08b2-d3da-40f9-81b1-a4976502dc61",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2.json
new file mode 100644
index 0000000000..ab60864437
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/orgs_github-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "18ee08b2-d3da-40f9-81b1-a4976502dc61",
+  "name": "orgs_github",
+  "request": {
+    "url": "/orgs/github",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4900",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
+      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F363:67D5:E0FD09:10F08E1:5D964448"
+    }
+  },
+  "uuid": "18ee08b2-d3da-40f9-81b1-a4976502dc61",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3-e0a029.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3-e0a029.json
deleted file mode 100644
index 5e758cab84..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3-e0a029.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e0a029ec-a3a9-4f0c-904f-de386dcfbfde",
-  "name": "repos_github_hub",
-  "request": {
-    "url": "/repos/github/hub",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub-e0a029ec-a3a9-4f0c-904f-de386dcfbfde.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
-      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F363:67D5:E0FD1C:10F0908:5D964448"
-    }
-  },
-  "uuid": "e0a029ec-a3a9-4f0c-904f-de386dcfbfde",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3.json
new file mode 100644
index 0000000000..13b6be394a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "e0a029ec-a3a9-4f0c-904f-de386dcfbfde",
+  "name": "repos_github_hub",
+  "request": {
+    "url": "/repos/github/hub",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4899",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
+      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F363:67D5:E0FD1C:10F0908:5D964448"
+    }
+  },
+  "uuid": "e0a029ec-a3a9-4f0c-904f-de386dcfbfde",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub_releases_9223372036854775807-4-b82be5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub_releases_9223372036854775807-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub_releases_9223372036854775807-4-b82be5.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/repos_github_hub_releases_9223372036854775807-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1-f64c26.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1-f64c26.json
deleted file mode 100644
index 8e28884d3d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1-f64c26.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f64c26dc-b35e-4fef-ba8e-6747d1e1f89b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f64c26dc-b35e-4fef-ba8e-6747d1e1f89b.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4902",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F363:67D5:E0FCE1:10F08C9:5D964448"
-    }
-  },
-  "uuid": "f64c26dc-b35e-4fef-ba8e-6747d1e1f89b",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1.json
new file mode 100644
index 0000000000..4db0cfc2cf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseDoesNotExist/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f64c26dc-b35e-4fef-ba8e-6747d1e1f89b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4902",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F363:67D5:E0FCE1:10F08C9:5D964448"
+    }
+  },
+  "uuid": "f64c26dc-b35e-4fef-ba8e-6747d1e1f89b",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/orgs_github-f8d704eb-efb2-4a44-a403-144947461c8a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/orgs_github-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/orgs_github-f8d704eb-efb2-4a44-a403-144947461c8a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/orgs_github-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub-f5ba6b71-c860-406a-80ad-135d8e9e18c3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub-f5ba6b71-c860-406a-80ad-135d8e9e18c3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub_releases_6839710-2959bf19-ebbd-4b5f-9f83-07b70965577f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub_releases_6839710-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub_releases_6839710-2959bf19-ebbd-4b5f-9f83-07b70965577f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/repos_github_hub_releases_6839710-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/user-37773edf-8a04-4682-98f0-dd715240d160.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/user-37773edf-8a04-4682-98f0-dd715240d160.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2-f8d704.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2-f8d704.json
deleted file mode 100644
index ec5036f0bb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2-f8d704.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f8d704eb-efb2-4a44-a403-144947461c8a",
-  "name": "orgs_github",
-  "request": {
-    "url": "/orgs/github",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-f8d704eb-efb2-4a44-a403-144947461c8a.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4872",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
-      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F376:2CE8:13B1B37:178AF47:5D96444E"
-    }
-  },
-  "uuid": "f8d704eb-efb2-4a44-a403-144947461c8a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2.json
new file mode 100644
index 0000000000..bc3d2756be
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/orgs_github-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f8d704eb-efb2-4a44-a403-144947461c8a",
+  "name": "orgs_github",
+  "request": {
+    "url": "/orgs/github",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4872",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
+      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F376:2CE8:13B1B37:178AF47:5D96444E"
+    }
+  },
+  "uuid": "f8d704eb-efb2-4a44-a403-144947461c8a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3-f5ba6b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3-f5ba6b.json
deleted file mode 100644
index 0150909967..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3-f5ba6b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f5ba6b71-c860-406a-80ad-135d8e9e18c3",
-  "name": "repos_github_hub",
-  "request": {
-    "url": "/repos/github/hub",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub-f5ba6b71-c860-406a-80ad-135d8e9e18c3.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4871",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
-      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F376:2CE8:13B1B45:178AF93:5D96444E"
-    }
-  },
-  "uuid": "f5ba6b71-c860-406a-80ad-135d8e9e18c3",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3.json
new file mode 100644
index 0000000000..853dbe1f7a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "f5ba6b71-c860-406a-80ad-135d8e9e18c3",
+  "name": "repos_github_hub",
+  "request": {
+    "url": "/repos/github/hub",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4871",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
+      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F376:2CE8:13B1B45:178AF93:5D96444E"
+    }
+  },
+  "uuid": "f5ba6b71-c860-406a-80ad-135d8e9e18c3",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4-2959bf.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4-2959bf.json
deleted file mode 100644
index 8d53d9498c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4-2959bf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2959bf19-ebbd-4b5f-9f83-07b70965577f",
-  "name": "repos_github_hub_releases_6839710",
-  "request": {
-    "url": "/repos/github/hub/releases/6839710",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub_releases_6839710-2959bf19-ebbd-4b5f-9f83-07b70965577f.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4870",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"646e273b4cd306db2adb200e942b8b76\"",
-      "Last-Modified": "Mon, 26 Jun 2017 21:26:01 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F376:2CE8:13B1B7C:178AFBB:5D96444F"
-    }
-  },
-  "uuid": "2959bf19-ebbd-4b5f-9f83-07b70965577f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4.json
new file mode 100644
index 0000000000..0bd2a9f712
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/repos_github_hub_releases_6839710-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "2959bf19-ebbd-4b5f-9f83-07b70965577f",
+  "name": "repos_github_hub_releases_6839710",
+  "request": {
+    "url": "/repos/github/hub/releases/6839710",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub_releases_6839710-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4870",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"646e273b4cd306db2adb200e942b8b76\"",
+      "Last-Modified": "Mon, 26 Jun 2017 21:26:01 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F376:2CE8:13B1B7C:178AFBB:5D96444F"
+    }
+  },
+  "uuid": "2959bf19-ebbd-4b5f-9f83-07b70965577f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1-37773e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1-37773e.json
deleted file mode 100644
index 870323796f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1-37773e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "37773edf-8a04-4682-98f0-dd715240d160",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-37773edf-8a04-4682-98f0-dd715240d160.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4874",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F376:2CE8:13B1AF0:178AF2F:5D96444E"
-    }
-  },
-  "uuid": "37773edf-8a04-4682-98f0-dd715240d160",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1.json
new file mode 100644
index 0000000000..9ab91cfa1f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getReleaseExists/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "37773edf-8a04-4682-98f0-dd715240d160",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4874",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F376:2CE8:13B1AF0:178AF2F:5D96444E"
+    }
+  },
+  "uuid": "37773edf-8a04-4682-98f0-dd715240d160",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/orgs_github-api-test-org-5ebb4358-3c06-491c-9814-8bdb0ec9e00b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/orgs_github-api-test-org-5ebb4358-3c06-491c-9814-8bdb0ec9e00b.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api-65381ed0-8f62-4720-a188-44933eee0fdf.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api-65381ed0-8f62-4720-a188-44933eee0fdf.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api_collaborators-b0680d17-cd3b-4ec0-a857-d352c7167e94.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api_collaborators-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api_collaborators-b0680d17-cd3b-4ec0-a857-d352c7167e94.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/repos_github-api-test-org_github-api_collaborators-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/user-b9ef1fbf-cf24-4083-9fb0-94e698629c4e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/user-b9ef1fbf-cf24-4083-9fb0-94e698629c4e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2-5ebb43.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2-5ebb43.json
deleted file mode 100644
index 0dca4e0f14..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2-5ebb43.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5ebb4358-3c06-491c-9814-8bdb0ec9e00b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5ebb4358-3c06-491c-9814-8bdb0ec9e00b.json",
-    "headers": {
-      "Date": "Wed, 12 Feb 2020 00:43:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4988",
-      "X-RateLimit-Reset": "1581471155",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept"
-      ],
-      "ETag": "W/\"75d6d979ad0098ece26e54f88ea58d8c\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBCC:9D3F:1C74FD:22ADAB:5E434A18"
-    }
-  },
-  "uuid": "5ebb4358-3c06-491c-9814-8bdb0ec9e00b",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..f8213eca21
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "5ebb4358-3c06-491c-9814-8bdb0ec9e00b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Wed, 12 Feb 2020 00:43:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "1581471155",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept"
+      ],
+      "ETag": "W/\"75d6d979ad0098ece26e54f88ea58d8c\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBCC:9D3F:1C74FD:22ADAB:5E434A18"
+    }
+  },
+  "uuid": "5ebb4358-3c06-491c-9814-8bdb0ec9e00b",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3-65381e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3-65381e.json
deleted file mode 100644
index 06e7549889..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3-65381e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "65381ed0-8f62-4720-a188-44933eee0fdf",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-65381ed0-8f62-4720-a188-44933eee0fdf.json",
-    "headers": {
-      "Date": "Wed, 12 Feb 2020 00:43:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "1581471155",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept"
-      ],
-      "ETag": "W/\"fd926c65cccfb4df9df31aa588c78ade\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBCC:9D3F:1C750A:22ADEE:5E434A19"
-    }
-  },
-  "uuid": "65381ed0-8f62-4720-a188-44933eee0fdf",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..349fc5b1e7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "65381ed0-8f62-4720-a188-44933eee0fdf",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Wed, 12 Feb 2020 00:43:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1581471155",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept"
+      ],
+      "ETag": "W/\"fd926c65cccfb4df9df31aa588c78ade\"",
+      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBCC:9D3F:1C750A:22ADEE:5E434A19"
+    }
+  },
+  "uuid": "65381ed0-8f62-4720-a188-44933eee0fdf",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-b0680d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-b0680d.json
deleted file mode 100644
index 3db1c673f3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4-b0680d.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "b0680d17-cd3b-4ec0-a857-d352c7167e94",
-  "name": "repos_github-api-test-org_github-api_collaborators",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/collaborators",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_collaborators-b0680d17-cd3b-4ec0-a857-d352c7167e94.json",
-    "headers": {
-      "Date": "Wed, 12 Feb 2020 00:43:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "1581471156",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept"
-      ],
-      "ETag": "W/\"0c159ae47d35c3c05c29bc764cb9ca1d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBCC:9D3F:1C752A:22AE01:5E434A19"
-    }
-  },
-  "uuid": "b0680d17-cd3b-4ec0-a857-d352c7167e94",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json
new file mode 100644
index 0000000000..f07b15341d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/repos_github-api-test-org_github-api_collaborators-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "b0680d17-cd3b-4ec0-a857-d352c7167e94",
+  "name": "repos_github-api-test-org_github-api_collaborators",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/collaborators",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_collaborators-4.json",
+    "headers": {
+      "Date": "Wed, 12 Feb 2020 00:43:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "1581471156",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept"
+      ],
+      "ETag": "W/\"0c159ae47d35c3c05c29bc764cb9ca1d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBCC:9D3F:1C752A:22AE01:5E434A19"
+    }
+  },
+  "uuid": "b0680d17-cd3b-4ec0-a857-d352c7167e94",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1-b9ef1f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1-b9ef1f.json
deleted file mode 100644
index ae5cab9db2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1-b9ef1f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b9ef1fbf-cf24-4083-9fb0-94e698629c4e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b9ef1fbf-cf24-4083-9fb0-94e698629c4e.json",
-    "headers": {
-      "Date": "Wed, 12 Feb 2020 00:43:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1581471155",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept"
-      ],
-      "ETag": "W/\"e87e4a976abe11bf6f62d5a01a679780\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBCC:9D3F:1C74BE:22AD9B:5E434A18"
-    }
-  },
-  "uuid": "b9ef1fbf-cf24-4083-9fb0-94e698629c4e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1.json
new file mode 100644
index 0000000000..7a94d7a19b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listCollaborators/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b9ef1fbf-cf24-4083-9fb0-94e698629c4e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 12 Feb 2020 00:43:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1581471155",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept"
+      ],
+      "ETag": "W/\"e87e4a976abe11bf6f62d5a01a679780\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBCC:9D3F:1C74BE:22AD9B:5E434A18"
+    }
+  },
+  "uuid": "b9ef1fbf-cf24-4083-9fb0-94e698629c4e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/orgs_github-api-7c4b2a82-e18f-45a2-a6b5-4baaea191b89.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/orgs_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/orgs_github-api-7c4b2a82-e18f-45a2-a6b5-4baaea191b89.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/orgs_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api-d87d9579-8da1-4f01-a6e6-6f91e04cc8a7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api-d87d9579-8da1-4f01-a6e6-6f91e04cc8a7.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api_contributors-cd622100-1a8e-4b33-9716-dbaf0b55c2aa.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api_contributors-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api_contributors-cd622100-1a8e-4b33-9716-dbaf0b55c2aa.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/repos_github-api_github-api_contributors-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/user-5705a11e-1421-4985-8e1f-b1e25b4ef547.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/user-5705a11e-1421-4985-8e1f-b1e25b4ef547.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2-7c4b2a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2-7c4b2a.json
deleted file mode 100644
index 517ad7f7f2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2-7c4b2a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7c4b2a82-e18f-45a2-a6b5-4baaea191b89",
-  "name": "orgs_github-api",
-  "request": {
-    "url": "/orgs/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-7c4b2a82-e18f-45a2-a6b5-4baaea191b89.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"62b7633c1dd73301f853bcc0da2d8504\"",
-      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F355:2CE7:106E7C3:13682F9:5D964442"
-    }
-  },
-  "uuid": "7c4b2a82-e18f-45a2-a6b5-4baaea191b89",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2.json
new file mode 100644
index 0000000000..59854f72c4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/orgs_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7c4b2a82-e18f-45a2-a6b5-4baaea191b89",
+  "name": "orgs_github-api",
+  "request": {
+    "url": "/orgs/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"62b7633c1dd73301f853bcc0da2d8504\"",
+      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F355:2CE7:106E7C3:13682F9:5D964442"
+    }
+  },
+  "uuid": "7c4b2a82-e18f-45a2-a6b5-4baaea191b89",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3-d87d95.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3-d87d95.json
deleted file mode 100644
index 480f37992f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3-d87d95.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d87d9579-8da1-4f01-a6e6-6f91e04cc8a7",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-d87d9579-8da1-4f01-a6e6-6f91e04cc8a7.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4921",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ee2a44ea003736b3fc98deff8fb5ff11\"",
-      "Last-Modified": "Thu, 03 Oct 2019 09:41:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F355:2CE7:106E7D7:1368356:5D964443"
-    }
-  },
-  "uuid": "d87d9579-8da1-4f01-a6e6-6f91e04cc8a7",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..922946ead9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d87d9579-8da1-4f01-a6e6-6f91e04cc8a7",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4921",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ee2a44ea003736b3fc98deff8fb5ff11\"",
+      "Last-Modified": "Thu, 03 Oct 2019 09:41:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F355:2CE7:106E7D7:1368356:5D964443"
+    }
+  },
+  "uuid": "d87d9579-8da1-4f01-a6e6-6f91e04cc8a7",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4-cd6221.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4-cd6221.json
deleted file mode 100644
index dae078b4f0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4-cd6221.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "cd622100-1a8e-4b33-9716-dbaf0b55c2aa",
-  "name": "repos_github-api_github-api_contributors",
-  "request": {
-    "url": "/repos/github-api/github-api/contributors",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contributors-cd622100-1a8e-4b33-9716-dbaf0b55c2aa.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:03 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4920",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a1b7dbc652ab098b5033f9fa5b3bfc62\"",
-      "Last-Modified": "Thu, 03 Oct 2019 09:41:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Link": "<https://api.github.com/repositories/617210/contributors?page=2>; rel=\"next\", <https://api.github.com/repositories/617210/contributors?page=4>; rel=\"last\"",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F355:2CE7:106E7F3:1368377:5D964443"
-    }
-  },
-  "uuid": "cd622100-1a8e-4b33-9716-dbaf0b55c2aa",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4.json
new file mode 100644
index 0000000000..c8399efc0a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/repos_github-api_github-api_contributors-4.json
@@ -0,0 +1,49 @@
+{
+  "id": "cd622100-1a8e-4b33-9716-dbaf0b55c2aa",
+  "name": "repos_github-api_github-api_contributors",
+  "request": {
+    "url": "/repos/github-api/github-api/contributors",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contributors-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:03 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4920",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a1b7dbc652ab098b5033f9fa5b3bfc62\"",
+      "Last-Modified": "Thu, 03 Oct 2019 09:41:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Link": "<https://api.github.com/repositories/617210/contributors?page=2>; rel=\"next\", <https://api.github.com/repositories/617210/contributors?page=4>; rel=\"last\"",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F355:2CE7:106E7F3:1368377:5D964443"
+    }
+  },
+  "uuid": "cd622100-1a8e-4b33-9716-dbaf0b55c2aa",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1-5705a1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1-5705a1.json
deleted file mode 100644
index 4895b31ff8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1-5705a1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5705a11e-1421-4985-8e1f-b1e25b4ef547",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-5705a11e-1421-4985-8e1f-b1e25b4ef547.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4924",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F355:2CE7:106E772:13682E3:5D964442"
-    }
-  },
-  "uuid": "5705a11e-1421-4985-8e1f-b1e25b4ef547",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1.json
new file mode 100644
index 0000000000..1457e80ac8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listContributors/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "5705a11e-1421-4985-8e1f-b1e25b4ef547",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4924",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F355:2CE7:106E772:13682E3:5D964442"
+    }
+  },
+  "uuid": "5705a11e-1421-4985-8e1f-b1e25b4ef547",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/repos_github-api-test-org_empty-af73e21a-68d3-4683-a1e1-3415319211e4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/repos_github-api-test-org_empty-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/repos_github-api-test-org_empty-af73e21a-68d3-4683-a1e1-3415319211e4.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/repos_github-api-test-org_empty-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/user-8d2ebbe4-ff50-4d3e-9932-d48541155f86.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/user-8d2ebbe4-ff50-4d3e-9932-d48541155f86.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2-af73e2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2-af73e2.json
deleted file mode 100644
index c7ef4ab4df..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2-af73e2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "af73e21a-68d3-4683-a1e1-3415319211e4",
-  "name": "repos_github-api-test-org_empty",
-  "request": {
-    "url": "/repos/github-api-test-org/empty",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_empty-af73e21a-68d3-4683-a1e1-3415319211e4.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:34:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4826",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"71a57ee919c57e5e9eb076f615232a66\"",
-      "Last-Modified": "Sat, 04 Jun 2016 03:22:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D778:2CE6:7EE78B:96BD39:5D969385"
-    }
-  },
-  "uuid": "af73e21a-68d3-4683-a1e1-3415319211e4",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2.json
new file mode 100644
index 0000000000..797e89214e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "af73e21a-68d3-4683-a1e1-3415319211e4",
+  "name": "repos_github-api-test-org_empty",
+  "request": {
+    "url": "/repos/github-api-test-org/empty",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_empty-2.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:34:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4826",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"71a57ee919c57e5e9eb076f615232a66\"",
+      "Last-Modified": "Sat, 04 Jun 2016 03:22:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D778:2CE6:7EE78B:96BD39:5D969385"
+    }
+  },
+  "uuid": "af73e21a-68d3-4683-a1e1-3415319211e4",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty_contributors-3-dae0e3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty_contributors-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty_contributors-3-dae0e3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/repos_github-api-test-org_empty_contributors-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1-8d2ebb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1-8d2ebb.json
deleted file mode 100644
index fddb45b214..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1-8d2ebb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8d2ebbe4-ff50-4d3e-9932-d48541155f86",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8d2ebbe4-ff50-4d3e-9932-d48541155f86.json",
-    "headers": {
-      "Date": "Fri, 04 Oct 2019 00:34:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4828",
-      "X-RateLimit-Reset": "1570151182",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D778:2CE6:7EE777:96BD36:5D969385"
-    }
-  },
-  "uuid": "8d2ebbe4-ff50-4d3e-9932-d48541155f86",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1.json
new file mode 100644
index 0000000000..abd3e5527d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listEmptyContributors/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8d2ebbe4-ff50-4d3e-9932-d48541155f86",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 04 Oct 2019 00:34:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4828",
+      "X-RateLimit-Reset": "1570151182",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D778:2CE6:7EE777:96BD36:5D969385"
+    }
+  },
+  "uuid": "8d2ebbe4-ff50-4d3e-9932-d48541155f86",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/repos_github-api_github-api-1852eb94-7578-45d0-8b90-fa23b623dccf.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/repos_github-api_github-api-1852eb94-7578-45d0-8b90-fa23b623dccf.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/user-aab4cb17-6715-454d-8498-f30d5e2ca5a2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/user-aab4cb17-6715-454d-8498-f30d5e2ca5a2.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2-1852eb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2-1852eb.json
deleted file mode 100644
index 8869228a2f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2-1852eb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1852eb94-7578-45d0-8b90-fa23b623dccf",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-1852eb94-7578-45d0-8b90-fa23b623dccf.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4881",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ee2a44ea003736b3fc98deff8fb5ff11\"",
-      "Last-Modified": "Thu, 03 Oct 2019 09:41:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F36F:6B2D:F352CB:1222540:5D96444C"
-    }
-  },
-  "uuid": "1852eb94-7578-45d0-8b90-fa23b623dccf",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..fab61c6646
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "1852eb94-7578-45d0-8b90-fa23b623dccf",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4881",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ee2a44ea003736b3fc98deff8fb5ff11\"",
+      "Last-Modified": "Thu, 03 Oct 2019 09:41:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F36F:6B2D:F352CB:1222540:5D96444C"
+    }
+  },
+  "uuid": "1852eb94-7578-45d0-8b90-fa23b623dccf",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api_languages-3-acab46.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api_languages-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api_languages-3-acab46.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/repos_github-api_github-api_languages-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1-aab4cb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1-aab4cb.json
deleted file mode 100644
index a1c0cefec6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1-aab4cb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "aab4cb17-6715-454d-8498-f30d5e2ca5a2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-aab4cb17-6715-454d-8498-f30d5e2ca5a2.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4883",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F36F:6B2D:F352A1:1222523:5D96444C"
-    }
-  },
-  "uuid": "aab4cb17-6715-454d-8498-f30d5e2ca5a2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1.json
new file mode 100644
index 0000000000..627128faa6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listLanguages/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "aab4cb17-6715-454d-8498-f30d5e2ca5a2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4883",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F36F:6B2D:F352A1:1222523:5D96444C"
+    }
+  },
+  "uuid": "aab4cb17-6715-454d-8498-f30d5e2ca5a2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs-368c90b4-cb7c-45c8-aca0-2c5c02456d2a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs-368c90b4-cb7c-45c8-aca0-2c5c02456d2a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs_git_refs-efdb254c-0993-4b3e-8094-b67bb6261b43.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs_git_refs-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs_git_refs-efdb254c-0993-4b3e-8094-b67bb6261b43.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/repos_github-api-test-org_temp-listrefs_git_refs-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/user-b4ac1b5e-eecc-4844-b014-67e67c77fb7a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/user-b4ac1b5e-eecc-4844-b014-67e67c77fb7a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2-368c90.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2-368c90.json
deleted file mode 100644
index 78e9d6c203..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2-368c90.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "368c90b4-cb7c-45c8-aca0-2c5c02456d2a",
-  "name": "repos_github-api-test-org_temp-listrefs",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-listRefs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-listrefs-368c90b4-cb7c-45c8-aca0-2c5c02456d2a.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"96960adedc08c2d2187e0fab6aa8cd24\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:18:44 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F689:89C6:A2C550:C78F1A:5E18EA2F"
-    }
-  },
-  "uuid": "368c90b4-cb7c-45c8-aca0-2c5c02456d2a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2.json
new file mode 100644
index 0000000000..bab7f09bef
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "368c90b4-cb7c-45c8-aca0-2c5c02456d2a",
+  "name": "repos_github-api-test-org_temp-listrefs",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-listRefs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-listrefs-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"96960adedc08c2d2187e0fab6aa8cd24\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:18:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F689:89C6:A2C550:C78F1A:5E18EA2F"
+    }
+  },
+  "uuid": "368c90b4-cb7c-45c8-aca0-2c5c02456d2a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3-efdb25.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3-efdb25.json
deleted file mode 100644
index 488bdb60e3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3-efdb25.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "efdb254c-0993-4b3e-8094-b67bb6261b43",
-  "name": "repos_github-api-test-org_temp-listrefs_git_refs",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-listRefs/git/refs",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-listrefs_git_refs-efdb254c-0993-4b3e-8094-b67bb6261b43.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8b1d346181ca603baeb51ac7847b5553\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:18:44 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F689:89C6:A2C55F:C7906D:5E18EA35"
-    }
-  },
-  "uuid": "efdb254c-0993-4b3e-8094-b67bb6261b43",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3.json
new file mode 100644
index 0000000000..28fbaed4ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/repos_github-api-test-org_temp-listrefs_git_refs-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "efdb254c-0993-4b3e-8094-b67bb6261b43",
+  "name": "repos_github-api-test-org_temp-listrefs_git_refs",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-listRefs/git/refs",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-listrefs_git_refs-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4907",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8b1d346181ca603baeb51ac7847b5553\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:18:44 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F689:89C6:A2C55F:C7906D:5E18EA35"
+    }
+  },
+  "uuid": "efdb254c-0993-4b3e-8094-b67bb6261b43",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1-b4ac1b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1-b4ac1b.json
deleted file mode 100644
index f318eaf229..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1-b4ac1b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b4ac1b5e-eecc-4844-b014-67e67c77fb7a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b4ac1b5e-eecc-4844-b014-67e67c77fb7a.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4913",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F689:89C6:A2C440:C78F12:5E18EA2F"
-    }
-  },
-  "uuid": "b4ac1b5e-eecc-4844-b014-67e67c77fb7a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1.json
new file mode 100644
index 0000000000..4bd8100144
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefs/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b4ac1b5e-eecc-4844-b014-67e67c77fb7a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4913",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F689:89C6:A2C440:C78F12:5E18EA2F"
+    }
+  },
+  "uuid": "b4ac1b5e-eecc-4844-b014-67e67c77fb7a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/repos_github-api-test-org_temp-listrefsemptytags-fd0b4371-0538-48a0-b577-af5e61538e1c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/repos_github-api-test-org_temp-listrefsemptytags-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/repos_github-api-test-org_temp-listrefsemptytags-fd0b4371-0538-48a0-b577-af5e61538e1c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/repos_github-api-test-org_temp-listrefsemptytags-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/user-ddaa07ce-0561-498e-b1a4-7738966139d1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/user-ddaa07ce-0561-498e-b1a4-7738966139d1.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2-fd0b43.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2-fd0b43.json
deleted file mode 100644
index a451c1ae24..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2-fd0b43.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "fd0b4371-0538-48a0-b577-af5e61538e1c",
-  "name": "repos_github-api-test-org_temp-listrefsemptytags",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-listRefsEmptyTags",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-listrefsemptytags-fd0b4371-0538-48a0-b577-af5e61538e1c.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4959",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1beb9a29b1b4c75746dce5f20c9ce03\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:18:05 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F62C:6E55:BA2D73:E4910D:5E18EA08"
-    }
-  },
-  "uuid": "fd0b4371-0538-48a0-b577-af5e61538e1c",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2.json
new file mode 100644
index 0000000000..5276d3a79f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "fd0b4371-0538-48a0-b577-af5e61538e1c",
+  "name": "repos_github-api-test-org_temp-listrefsemptytags",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-listRefsEmptyTags",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-listrefsemptytags-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1beb9a29b1b4c75746dce5f20c9ce03\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:18:05 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F62C:6E55:BA2D73:E4910D:5E18EA08"
+    }
+  },
+  "uuid": "fd0b4371-0538-48a0-b577-af5e61538e1c",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags_git_refs_tags-3-a80c1b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags_git_refs_tags-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags_git_refs_tags-3-a80c1b.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/repos_github-api-test-org_temp-listrefsemptytags_git_refs_tags-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1-ddaa07.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1-ddaa07.json
deleted file mode 100644
index 5ad13cbb66..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1-ddaa07.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ddaa07ce-0561-498e-b1a4-7738966139d1",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ddaa07ce-0561-498e-b1a4-7738966139d1.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:18:00 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F62C:6E55:BA2B8E:E490FD:5E18EA08"
-    }
-  },
-  "uuid": "ddaa07ce-0561-498e-b1a4-7738966139d1",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1.json
new file mode 100644
index 0000000000..e441759036
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsEmptyTags/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "ddaa07ce-0561-498e-b1a4-7738966139d1",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:18:00 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F62C:6E55:BA2B8E:E490FD:5E18EA08"
+    }
+  },
+  "uuid": "ddaa07ce-0561-498e-b1a4-7738966139d1",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads-41a76215-5c4e-4604-8785-f3ef59b68ade.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads-41a76215-5c4e-4604-8785-f3ef59b68ade.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-1f4fd84a-23db-43f3-bf4b-afa585364f08.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-1f4fd84a-23db-43f3-bf4b-afa585364f08.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/user-8da6cb32-8bd1-4e7b-b4d7-de0426c59757.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/user-8da6cb32-8bd1-4e7b-b4d7-de0426c59757.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2-41a762.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2-41a762.json
deleted file mode 100644
index a045633272..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2-41a762.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "41a76215-5c4e-4604-8785-f3ef59b68ade",
-  "name": "repos_github-api-test-org_temp-listrefsheads",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-listRefsHeads",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-listrefsheads-41a76215-5c4e-4604-8785-f3ef59b68ade.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:17:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4982",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"61378bfcc80b286cc38c3c6d4b8f12af\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:17:48 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F60B:7D24:B424DD:DB914E:5E18E9F8"
-    }
-  },
-  "uuid": "41a76215-5c4e-4604-8785-f3ef59b68ade",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2.json
new file mode 100644
index 0000000000..e811e93483
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "41a76215-5c4e-4604-8785-f3ef59b68ade",
+  "name": "repos_github-api-test-org_temp-listrefsheads",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-listRefsHeads",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-listrefsheads-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:17:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4982",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"61378bfcc80b286cc38c3c6d4b8f12af\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:17:48 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F60B:7D24:B424DD:DB914E:5E18E9F8"
+    }
+  },
+  "uuid": "41a76215-5c4e-4604-8785-f3ef59b68ade",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3-1f4fd8.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3-1f4fd8.json
deleted file mode 100644
index 589659f174..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3-1f4fd8.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "1f4fd84a-23db-43f3-bf4b-afa585364f08",
-  "name": "repos_github-api-test-org_temp-listrefsheads_git_refs_heads",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-listRefsHeads/git/refs/heads",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-listrefsheads_git_refs_heads-1f4fd84a-23db-43f3-bf4b-afa585364f08.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:17:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"277ebd234e4056457f05d87b3b176447\"",
-      "Last-Modified": "Fri, 10 Jan 2020 21:17:48 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F60B:7D24:B424E8:DB92C6:5E18E9FE"
-    }
-  },
-  "uuid": "1f4fd84a-23db-43f3-bf4b-afa585364f08",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json
new file mode 100644
index 0000000000..46d9910c59
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "1f4fd84a-23db-43f3-bf4b-afa585364f08",
+  "name": "repos_github-api-test-org_temp-listrefsheads_git_refs_heads",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-listRefsHeads/git/refs/heads",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-listrefsheads_git_refs_heads-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:17:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"277ebd234e4056457f05d87b3b176447\"",
+      "Last-Modified": "Fri, 10 Jan 2020 21:17:48 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F60B:7D24:B424E8:DB92C6:5E18E9FE"
+    }
+  },
+  "uuid": "1f4fd84a-23db-43f3-bf4b-afa585364f08",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1-8da6cb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1-8da6cb.json
deleted file mode 100644
index 688f8c0780..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1-8da6cb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8da6cb32-8bd1-4e7b-b4d7-de0426c59757",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8da6cb32-8bd1-4e7b-b4d7-de0426c59757.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 21:17:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "1578694499",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F60B:7D24:B423B1:DB9144:5E18E9F8"
-    }
-  },
-  "uuid": "8da6cb32-8bd1-4e7b-b4d7-de0426c59757",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1.json
new file mode 100644
index 0000000000..991970c05d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listRefsHeads/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "8da6cb32-8bd1-4e7b-b4d7-de0426c59757",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 21:17:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "1578694499",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F60B:7D24:B423B1:DB9144:5E18E9F8"
+    }
+  },
+  "uuid": "8da6cb32-8bd1-4e7b-b4d7-de0426c59757",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/orgs_github-c4db4df5-1d50-46c5-b667-0a3b1d9653e6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/orgs_github-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/orgs_github-c4db4df5-1d50-46c5-b667-0a3b1d9653e6.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/orgs_github-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub-8338609c-0f4c-4fe5-9ca6-fc64b08673be.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub-8338609c-0f4c-4fe5-9ca6-fc64b08673be.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub_releases-5c5da4ad-d9da-4ce8-8076-8797eb1070a9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub_releases-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub_releases-5c5da4ad-d9da-4ce8-8076-8797eb1070a9.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/repos_github_hub_releases-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/user-95be222c-381f-4c01-bac9-fedbc8963616.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/user-95be222c-381f-4c01-bac9-fedbc8963616.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2-c4db4d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2-c4db4d.json
deleted file mode 100644
index 2697b4db4b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2-c4db4d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c4db4df5-1d50-46c5-b667-0a3b1d9653e6",
-  "name": "orgs_github",
-  "request": {
-    "url": "/orgs/github",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-c4db4df5-1d50-46c5-b667-0a3b1d9653e6.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4891",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
-      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F369:6B2A:D9659:10A410:5D964449"
-    }
-  },
-  "uuid": "c4db4df5-1d50-46c5-b667-0a3b1d9653e6",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2.json
new file mode 100644
index 0000000000..2370d2aaab
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/orgs_github-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "c4db4df5-1d50-46c5-b667-0a3b1d9653e6",
+  "name": "orgs_github",
+  "request": {
+    "url": "/orgs/github",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4891",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a94c0016d0297e64c700cb8e371e1f51\"",
+      "Last-Modified": "Mon, 15 Jul 2019 14:26:15 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F369:6B2A:D9659:10A410:5D964449"
+    }
+  },
+  "uuid": "c4db4df5-1d50-46c5-b667-0a3b1d9653e6",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3-833860.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3-833860.json
deleted file mode 100644
index 76fa26dba1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3-833860.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8338609c-0f4c-4fe5-9ca6-fc64b08673be",
-  "name": "repos_github_hub",
-  "request": {
-    "url": "/repos/github/hub",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub-8338609c-0f4c-4fe5-9ca6-fc64b08673be.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4890",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
-      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F369:6B2A:D965B:10A413:5D96444A"
-    }
-  },
-  "uuid": "8338609c-0f4c-4fe5-9ca6-fc64b08673be",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3.json
new file mode 100644
index 0000000000..b50277fe52
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "8338609c-0f4c-4fe5-9ca6-fc64b08673be",
+  "name": "repos_github_hub",
+  "request": {
+    "url": "/repos/github/hub",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4890",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fcc91b27b1425e55f5dd32d85d2cfa11\"",
+      "Last-Modified": "Thu, 03 Oct 2019 16:34:37 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F369:6B2A:D965B:10A413:5D96444A"
+    }
+  },
+  "uuid": "8338609c-0f4c-4fe5-9ca6-fc64b08673be",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4-5c5da4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4-5c5da4.json
deleted file mode 100644
index 4fe6177746..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4-5c5da4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5c5da4ad-d9da-4ce8-8076-8797eb1070a9",
-  "name": "repos_github_hub_releases",
-  "request": {
-    "url": "/repos/github/hub/releases",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github_hub_releases-5c5da4ad-d9da-4ce8-8076-8797eb1070a9.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4889",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4f7ac52e5a06994f064101e7c1c1586c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Link": "<https://api.github.com/repositories/401025/releases?page=2>; rel=\"next\", <https://api.github.com/repositories/401025/releases?page=2>; rel=\"last\"",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F369:6B2A:D965E:10A416:5D96444A"
-    }
-  },
-  "uuid": "5c5da4ad-d9da-4ce8-8076-8797eb1070a9",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4.json
new file mode 100644
index 0000000000..89be13f8a1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/repos_github_hub_releases-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "5c5da4ad-d9da-4ce8-8076-8797eb1070a9",
+  "name": "repos_github_hub_releases",
+  "request": {
+    "url": "/repos/github/hub/releases",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github_hub_releases-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4889",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4f7ac52e5a06994f064101e7c1c1586c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Link": "<https://api.github.com/repositories/401025/releases?page=2>; rel=\"next\", <https://api.github.com/repositories/401025/releases?page=2>; rel=\"last\"",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F369:6B2A:D965E:10A416:5D96444A"
+    }
+  },
+  "uuid": "5c5da4ad-d9da-4ce8-8076-8797eb1070a9",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1-95be22.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1-95be22.json
deleted file mode 100644
index 3aacd50948..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1-95be22.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "95be222c-381f-4c01-bac9-fedbc8963616",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-95be222c-381f-4c01-bac9-fedbc8963616.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4893",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F369:6B2A:D9656:10A40E:5D964449"
-    }
-  },
-  "uuid": "95be222c-381f-4c01-bac9-fedbc8963616",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1.json
new file mode 100644
index 0000000000..3627284992
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listReleases/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "95be222c-381f-4c01-bac9-fedbc8963616",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4893",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F369:6B2A:D9656:10A40E:5D964449"
+    }
+  },
+  "uuid": "95be222c-381f-4c01-bac9-fedbc8963616",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/orgs_github-api-test-org-02e4a8c7-56fe-4815-8d80-feabf5712da3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/orgs_github-api-test-org-02e4a8c7-56fe-4815-8d80-feabf5712da3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api-490a149b-ef4a-4edf-8417-725e174b0328.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api-490a149b-ef4a-4edf-8417-725e174b0328.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api_tags-76fbf62d-6d52-42f5-baa5-e4118a9a5b79.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api_tags-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api_tags-76fbf62d-6d52-42f5-baa5-e4118a9a5b79.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repos_github-api-test-org_github-api_tags-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-477fba2c-a17d-4e6b-b253-47936b2a0015.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-477fba2c-a17d-4e6b-b253-47936b2a0015.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-4c548e0c-f054-42c0-b6d7-e4322d352ccb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-4c548e0c-f054-42c0-b6d7-e4322d352ccb.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/repositories_206888201_tags-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/user-1be69923-8441-4b3e-8665-9766d40b5f75.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/user-1be69923-8441-4b3e-8665-9766d40b5f75.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2-02e4a8.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2-02e4a8.json
deleted file mode 100644
index f84a4cb52c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2-02e4a8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "02e4a8c7-56fe-4815-8d80-feabf5712da3",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-02e4a8c7-56fe-4815-8d80-feabf5712da3.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:18:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1578690845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"022de007d84a1f32d6d5877377e5df47\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F0C9:566F:C2D78D:EDAF88:5E18DC09"
-    }
-  },
-  "uuid": "02e4a8c7-56fe-4815-8d80-feabf5712da3",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..0803cd3436
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "02e4a8c7-56fe-4815-8d80-feabf5712da3",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:18:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1578690845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"022de007d84a1f32d6d5877377e5df47\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F0C9:566F:C2D78D:EDAF88:5E18DC09"
+    }
+  },
+  "uuid": "02e4a8c7-56fe-4815-8d80-feabf5712da3",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3-490a14.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3-490a14.json
deleted file mode 100644
index 0dce54003c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3-490a14.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "490a149b-ef4a-4edf-8417-725e174b0328",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-490a149b-ef4a-4edf-8417-725e174b0328.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4961",
-      "X-RateLimit-Reset": "1578690845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3e0462670f48a17b7dd97348812553f3\"",
-      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F0C9:566F:C2D799:EDAFBD:5E18DC09"
-    }
-  },
-  "uuid": "490a149b-ef4a-4edf-8417-725e174b0328",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..038b63cf7d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "490a149b-ef4a-4edf-8417-725e174b0328",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4961",
+      "X-RateLimit-Reset": "1578690845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3e0462670f48a17b7dd97348812553f3\"",
+      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F0C9:566F:C2D799:EDAFBD:5E18DC09"
+    }
+  },
+  "uuid": "490a149b-ef4a-4edf-8417-725e174b0328",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4-76fbf6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4-76fbf6.json
deleted file mode 100644
index 20d8f801cc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4-76fbf6.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "76fbf62d-6d52-42f5-baa5-e4118a9a5b79",
-  "name": "repos_github-api-test-org_github-api_tags",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/tags?per_page=33",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_tags-76fbf62d-6d52-42f5-baa5-e4118a9a5b79.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4960",
-      "X-RateLimit-Reset": "1578690845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"2a689b65eddbddc3c8edbcaf3192bb72\"",
-      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F0C9:566F:C2D7AD:EDAFD0:5E18DC0A",
-      "Link": "<https://api.github.com/repositories/206888201/tags?per_page=33&page=2>; rel=\"next\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=3>; rel=\"last\""
-    }
-  },
-  "uuid": "76fbf62d-6d52-42f5-baa5-e4118a9a5b79",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4.json
new file mode 100644
index 0000000000..2bc5f0c779
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repos_github-api-test-org_github-api_tags-4.json
@@ -0,0 +1,49 @@
+{
+  "id": "76fbf62d-6d52-42f5-baa5-e4118a9a5b79",
+  "name": "repos_github-api-test-org_github-api_tags",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/tags?per_page=33",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_tags-4.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4960",
+      "X-RateLimit-Reset": "1578690845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"2a689b65eddbddc3c8edbcaf3192bb72\"",
+      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F0C9:566F:C2D7AD:EDAFD0:5E18DC0A",
+      "Link": "<https://api.github.com/repositories/206888201/tags?per_page=33&page=2>; rel=\"next\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=3>; rel=\"last\""
+    }
+  },
+  "uuid": "76fbf62d-6d52-42f5-baa5-e4118a9a5b79",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5-477fba.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5-477fba.json
deleted file mode 100644
index ca5a739323..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5-477fba.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "477fba2c-a17d-4e6b-b253-47936b2a0015",
-  "name": "repositories_206888201_tags",
-  "request": {
-    "url": "/repositories/206888201/tags?per_page=33&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_tags-477fba2c-a17d-4e6b-b253-47936b2a0015.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4959",
-      "X-RateLimit-Reset": "1578690845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a3a6c2c6a1fa3834a9cfc00b415c676a\"",
-      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F0C9:566F:C2D7BA:EDAFE3:5E18DC0A",
-      "Link": "<https://api.github.com/repositories/206888201/tags?per_page=33&page=1>; rel=\"prev\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=3>; rel=\"next\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=3>; rel=\"last\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "477fba2c-a17d-4e6b-b253-47936b2a0015",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5.json
new file mode 100644
index 0000000000..168f276c50
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-5.json
@@ -0,0 +1,49 @@
+{
+  "id": "477fba2c-a17d-4e6b-b253-47936b2a0015",
+  "name": "repositories_206888201_tags",
+  "request": {
+    "url": "/repositories/206888201/tags?per_page=33&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_tags-5.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1578690845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a3a6c2c6a1fa3834a9cfc00b415c676a\"",
+      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F0C9:566F:C2D7BA:EDAFE3:5E18DC0A",
+      "Link": "<https://api.github.com/repositories/206888201/tags?per_page=33&page=1>; rel=\"prev\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=3>; rel=\"next\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=3>; rel=\"last\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "477fba2c-a17d-4e6b-b253-47936b2a0015",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6-4c548e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6-4c548e.json
deleted file mode 100644
index 0c5c83728b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6-4c548e.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "4c548e0c-f054-42c0-b6d7-e4322d352ccb",
-  "name": "repositories_206888201_tags",
-  "request": {
-    "url": "/repositories/206888201/tags?per_page=33&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_206888201_tags-4c548e0c-f054-42c0-b6d7-e4322d352ccb.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4958",
-      "X-RateLimit-Reset": "1578690845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"680645f8a886a98f249d1b403bb94c45\"",
-      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F0C9:566F:C2D7C4:EDAFEA:5E18DC0A",
-      "Link": "<https://api.github.com/repositories/206888201/tags?per_page=33&page=2>; rel=\"prev\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "4c548e0c-f054-42c0-b6d7-e4322d352ccb",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6.json
new file mode 100644
index 0000000000..2bd4731634
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/repositories_206888201_tags-6.json
@@ -0,0 +1,49 @@
+{
+  "id": "4c548e0c-f054-42c0-b6d7-e4322d352ccb",
+  "name": "repositories_206888201_tags",
+  "request": {
+    "url": "/repositories/206888201/tags?per_page=33&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_206888201_tags-6.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:18:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4958",
+      "X-RateLimit-Reset": "1578690845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"680645f8a886a98f249d1b403bb94c45\"",
+      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F0C9:566F:C2D7C4:EDAFEA:5E18DC0A",
+      "Link": "<https://api.github.com/repositories/206888201/tags?per_page=33&page=2>; rel=\"prev\", <https://api.github.com/repositories/206888201/tags?per_page=33&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "4c548e0c-f054-42c0-b6d7-e4322d352ccb",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1-1be699.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1-1be699.json
deleted file mode 100644
index d06b43b3dc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1-1be699.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1be69923-8441-4b3e-8665-9766d40b5f75",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1be69923-8441-4b3e-8665-9766d40b5f75.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:18:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1578690845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F0C9:566F:C2D765:EDAF82:5E18DC08"
-    }
-  },
-  "uuid": "1be69923-8441-4b3e-8665-9766d40b5f75",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1.json
new file mode 100644
index 0000000000..04b6c83bb0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTags/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1be69923-8441-4b3e-8665-9766d40b5f75",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:18:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1578690845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F0C9:566F:C2D765:EDAF82:5E18DC08"
+    }
+  },
+  "uuid": "1be69923-8441-4b3e-8665-9766d40b5f75",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/repos_github-api-test-org_temp-listtagsempty-13b3212b-3197-40b2-ab98-9bbb3ea9a8af.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/repos_github-api-test-org_temp-listtagsempty-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/repos_github-api-test-org_temp-listtagsempty-13b3212b-3197-40b2-ab98-9bbb3ea9a8af.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/repos_github-api-test-org_temp-listtagsempty-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/user-f450f169-1fb3-4d19-8716-8568f1bef559.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/user-f450f169-1fb3-4d19-8716-8568f1bef559.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2-13b321.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2-13b321.json
deleted file mode 100644
index b1ee69d02a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2-13b321.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "13b3212b-3197-40b2-ab98-9bbb3ea9a8af",
-  "name": "repos_github-api-test-org_temp-listtagsempty",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-listTagsEmpty",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-listtagsempty-13b3212b-3197-40b2-ab98-9bbb3ea9a8af.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:11:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1578690577",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6a92bf705a805aee74449b2548f2865c\"",
-      "Last-Modified": "Fri, 10 Jan 2020 20:11:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F059:566D:495A4A:5AF088:5E18DA6D"
-    }
-  },
-  "uuid": "13b3212b-3197-40b2-ab98-9bbb3ea9a8af",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2.json
new file mode 100644
index 0000000000..c83c4bf9ae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "13b3212b-3197-40b2-ab98-9bbb3ea9a8af",
+  "name": "repos_github-api-test-org_temp-listtagsempty",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-listTagsEmpty",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-listtagsempty-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:11:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1578690577",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6a92bf705a805aee74449b2548f2865c\"",
+      "Last-Modified": "Fri, 10 Jan 2020 20:11:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F059:566D:495A4A:5AF088:5E18DA6D"
+    }
+  },
+  "uuid": "13b3212b-3197-40b2-ab98-9bbb3ea9a8af",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty_tags-3-ce4b89.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty_tags-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty_tags-3-ce4b89.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/repos_github-api-test-org_temp-listtagsempty_tags-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1-f450f1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1-f450f1.json
deleted file mode 100644
index 2b1fad587d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1-f450f1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f450f169-1fb3-4d19-8716-8568f1bef559",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f450f169-1fb3-4d19-8716-8568f1bef559.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 20:11:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1578690577",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F059:566D:4959F2:5AF087:5E18DA6D"
-    }
-  },
-  "uuid": "f450f169-1fb3-4d19-8716-8568f1bef559",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1.json
new file mode 100644
index 0000000000..e41b0f444a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/listTagsEmpty/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f450f169-1fb3-4d19-8716-8568f1bef559",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 20:11:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1578690577",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F059:566D:4959F2:5AF087:5E18DA6D"
+    }
+  },
+  "uuid": "f450f169-1fb3-4d19-8716-8568f1bef559",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/markdown-82013a58-1976-472e-9bc9-2535b965c1ff.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/markdown-4.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/markdown-82013a58-1976-472e-9bc9-2535b965c1ff.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/markdown-4.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/repos_github-api_github-api-b97d0b95-42e5-462c-866b-f3dc51258730.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/repos_github-api_github-api-b97d0b95-42e5-462c-866b-f3dc51258730.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/user-d7cf6a1a-c0db-411d-b646-0a128e9b2aff.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/user-d7cf6a1a-c0db-411d-b646-0a128e9b2aff.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4-82013a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4-82013a.json
deleted file mode 100644
index 04c5a9c38e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4-82013a.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "82013a58-1976-472e-9bc9-2535b965c1ff",
-  "name": "markdown",
-  "request": {
-    "url": "/markdown",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"mode\":\"gfm\",\"context\":\"github-api/github-api\",\"text\":\"@kohsuke to fix issue #1\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "markdown-82013a58-1976-472e-9bc9-2535b965c1ff.txt",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:46 GMT",
-      "Content-Type": "text/html;charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4841",
-      "X-RateLimit-Reset": "1570482632",
-      "X-CommonMarker-Version": "0.20.0",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E94B:957A:38A6669:42F400F:5D9B9CF2"
-    }
-  },
-  "uuid": "82013a58-1976-472e-9bc9-2535b965c1ff",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4.json
new file mode 100644
index 0000000000..873f315f1d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "82013a58-1976-472e-9bc9-2535b965c1ff",
+  "name": "markdown",
+  "request": {
+    "url": "/markdown",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"mode\":\"gfm\",\"context\":\"github-api/github-api\",\"text\":\"@kohsuke to fix issue #1\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "markdown-4.txt",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:46 GMT",
+      "Content-Type": "text/html;charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4841",
+      "X-RateLimit-Reset": "1570482632",
+      "X-CommonMarker-Version": "0.20.0",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E94B:957A:38A6669:42F400F:5D9B9CF2"
+    }
+  },
+  "uuid": "82013a58-1976-472e-9bc9-2535b965c1ff",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown_raw-2-44dcd2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown_raw-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown_raw-2-44dcd2.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/markdown_raw-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3-b97d0b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3-b97d0b.json
deleted file mode 100644
index ce3424b5c6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3-b97d0b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b97d0b95-42e5-462c-866b-f3dc51258730",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-b97d0b95-42e5-462c-866b-f3dc51258730.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4842",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b359e0502299a07474385dbb4d0d9dbf\"",
-      "Last-Modified": "Sun, 06 Oct 2019 02:40:00 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E94B:957A:38A664D:42F3FF3:5D9B9CF2"
-    }
-  },
-  "uuid": "b97d0b95-42e5-462c-866b-f3dc51258730",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..b463624bb1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "b97d0b95-42e5-462c-866b-f3dc51258730",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4842",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b359e0502299a07474385dbb4d0d9dbf\"",
+      "Last-Modified": "Sun, 06 Oct 2019 02:40:00 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E94B:957A:38A664D:42F3FF3:5D9B9CF2"
+    }
+  },
+  "uuid": "b97d0b95-42e5-462c-866b-f3dc51258730",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1-d7cf6a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1-d7cf6a.json
deleted file mode 100644
index c4e891a424..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1-d7cf6a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d7cf6a1a-c0db-411d-b646-0a128e9b2aff",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d7cf6a1a-c0db-411d-b646-0a128e9b2aff.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:45 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4845",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E94B:957A:38A65E8:42F3F6E:5D9B9CF1"
-    }
-  },
-  "uuid": "d7cf6a1a-c0db-411d-b646-0a128e9b2aff",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1.json
new file mode 100644
index 0000000000..86a2bb71ef
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/markDown/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d7cf6a1a-c0db-411d-b646-0a128e9b2aff",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:45 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4845",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E94B:957A:38A65E8:42F3F6E:5D9B9CF1"
+    }
+  },
+  "uuid": "d7cf6a1a-c0db-411d-b646-0a128e9b2aff",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/search_repositories-03ff4bb7-7909-4e5b-9322-f8f3923fa65a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/search_repositories-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/search_repositories-03ff4bb7-7909-4e5b-9322-f8f3923fa65a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/search_repositories-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/user-3b3417e7-67e7-4612-a015-f97b98848847.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/user-3b3417e7-67e7-4612-a015-f97b98848847.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2-03ff4b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2-03ff4b.json
deleted file mode 100644
index f78e590913..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2-03ff4b.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "id": "03ff4bb7-7909-4e5b-9322-f8f3923fa65a",
-  "name": "search_repositories",
-  "request": {
-    "url": "/search/repositories?sort=stars&q=tetris+language%3Aassembly",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_repositories-03ff4bb7-7909-4e5b-9322-f8f3923fa65a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:59:49 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "28",
-      "X-RateLimit-Reset": "1570478429",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E531:3C9F:28FF686:30ABFB8:5D9B9934",
-      "Link": "<https://api.github.com/search/repositories?sort=stars&q=tetris+language%3Aassembly&page=2>; rel=\"next\", <https://api.github.com/search/repositories?sort=stars&q=tetris+language%3Aassembly&page=34>; rel=\"last\""
-    }
-  },
-  "uuid": "03ff4bb7-7909-4e5b-9322-f8f3923fa65a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2.json
new file mode 100644
index 0000000000..54fde2366c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/search_repositories-2.json
@@ -0,0 +1,44 @@
+{
+  "id": "03ff4bb7-7909-4e5b-9322-f8f3923fa65a",
+  "name": "search_repositories",
+  "request": {
+    "url": "/search/repositories?sort=stars&q=tetris+language%3Aassembly",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_repositories-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:59:49 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "28",
+      "X-RateLimit-Reset": "1570478429",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E531:3C9F:28FF686:30ABFB8:5D9B9934",
+      "Link": "<https://api.github.com/search/repositories?sort=stars&q=tetris+language%3Aassembly&page=2>; rel=\"next\", <https://api.github.com/search/repositories?sort=stars&q=tetris+language%3Aassembly&page=34>; rel=\"last\""
+    }
+  },
+  "uuid": "03ff4bb7-7909-4e5b-9322-f8f3923fa65a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1-3b3417.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1-3b3417.json
deleted file mode 100644
index 610aad56f1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1-3b3417.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3b3417e7-67e7-4612-a015-f97b98848847",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-3b3417e7-67e7-4612-a015-f97b98848847.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:59:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4892",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E531:3C9F:28FF655:30ABFA6:5D9B9933"
-    }
-  },
-  "uuid": "3b3417e7-67e7-4612-a015-f97b98848847",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1.json
new file mode 100644
index 0000000000..c507678128
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/searchRepositories/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "3b3417e7-67e7-4612-a015-f97b98848847",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:59:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4892",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E531:3C9F:28FF655:30ABFA6:5D9B9933"
+    }
+  },
+  "uuid": "3b3417e7-67e7-4612-a015-f97b98848847",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/orgs_github-api-test-org-3774735f-e809-4bd5-8c55-9243e2588747.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/orgs_github-api-test-org-3774735f-e809-4bd5-8c55-9243e2588747.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-93f4b207-0e0b-4b0a-a88e-2088b826a570.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-93f4b207-0e0b-4b0a-a88e-2088b826a570.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-850c61e4-3c20-4101-a754-cc801b26f76e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-850c61e4-3c20-4101-a754-cc801b26f76e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-c79f68ee-7ead-4b33-9903-bea9f47ef5b6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-c79f68ee-7ead-4b33-9903-bea9f47ef5b6.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-ff9f6ee5-57c2-4ca0-9296-69d5280e9172.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-ff9f6ee5-57c2-4ca0-9296-69d5280e9172.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/user-1520ef6e-b895-49bb-955e-0a0678e36010.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/user-1520ef6e-b895-49bb-955e-0a0678e36010.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-377473.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-377473.json
deleted file mode 100644
index dab0cb7f31..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2-377473.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3774735f-e809-4bd5-8c55-9243e2588747",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-3774735f-e809-4bd5-8c55-9243e2588747.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"7954438fb1265980b0ef2eb56c6b6336\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F74A2:1299BC:5E558586"
-    }
-  },
-  "uuid": "3774735f-e809-4bd5-8c55-9243e2588747",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..56746d8c40
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "3774735f-e809-4bd5-8c55-9243e2588747",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"7954438fb1265980b0ef2eb56c6b6336\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F74A2:1299BC:5E558586"
+    }
+  },
+  "uuid": "3774735f-e809-4bd5-8c55-9243e2588747",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-ff9f6e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-ff9f6e.json
deleted file mode 100644
index ed9facb51d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3-ff9f6e.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "ff9f6ee5-57c2-4ca0-9296-69d5280e9172",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ff9f6ee5-57c2-4ca0-9296-69d5280e9172.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4977",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"10238fa39bf0e212b3dd5d881ce7be66\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F74A4:1299C5:5E558587"
-    }
-  },
-  "uuid": "ff9f6ee5-57c2-4ca0-9296-69d5280e9172",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..4dbaccf2a0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "ff9f6ee5-57c2-4ca0-9296-69d5280e9172",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4977",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"10238fa39bf0e212b3dd5d881ce7be66\"",
+      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F74A4:1299C5:5E558587"
+    }
+  },
+  "uuid": "ff9f6ee5-57c2-4ca0-9296-69d5280e9172",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4-850c61.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4-850c61.json
deleted file mode 100644
index ab3865f3ac..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4-850c61.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "850c61e4-3c20-4101-a754-cc801b26f76e",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api\",\"delete_branch_on_merge\":\"true\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-850c61e4-3c20-4101-a754-cc801b26f76e.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"8194bcdd4d9c5fddf83632fd1219f170\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F74AC:1299C9:5E558587"
-    }
-  },
-  "uuid": "850c61e4-3c20-4101-a754-cc801b26f76e",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4.json
new file mode 100644
index 0000000000..e423a32555
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "850c61e4-3c20-4101-a754-cc801b26f76e",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api\",\"delete_branch_on_merge\":\"true\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4976",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"8194bcdd4d9c5fddf83632fd1219f170\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F74AC:1299C9:5E558587"
+    }
+  },
+  "uuid": "850c61e4-3c20-4101-a754-cc801b26f76e",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5-c79f68.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5-c79f68.json
deleted file mode 100644
index 9cd63b27f9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5-c79f68.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c79f68ee-7ead-4b33-9903-bea9f47ef5b6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-c79f68ee-7ead-4b33-9903-bea9f47ef5b6.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"10e30acb4e6c8c932a64c8bcea8758fb\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F74B2:1299D2:5E558588"
-    }
-  },
-  "uuid": "c79f68ee-7ead-4b33-9903-bea9f47ef5b6",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..231ec476dd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "c79f68ee-7ead-4b33-9903-bea9f47ef5b6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"10e30acb4e6c8c932a64c8bcea8758fb\"",
+      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F74B2:1299D2:5E558588"
+    }
+  },
+  "uuid": "c79f68ee-7ead-4b33-9903-bea9f47ef5b6",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6-0e5ceb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6-0e5ceb.json
deleted file mode 100644
index c6cb88c35c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6-0e5ceb.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api\",\"delete_branch_on_merge\":\"false\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"c397a2603c9c84c68389c52dd405559c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F74B5:1299D8:5E558588"
-    }
-  },
-  "uuid": "0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..7b55c8ea25
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,54 @@
+{
+  "id": "0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api\",\"delete_branch_on_merge\":\"false\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"c397a2603c9c84c68389c52dd405559c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F74B5:1299D8:5E558588"
+    }
+  },
+  "uuid": "0e5ceb13-2f1e-40ac-9b4c-86ccf38a62d6",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7-93f4b2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7-93f4b2.json
deleted file mode 100644
index 30501a0846..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7-93f4b2.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "93f4b207-0e0b-4b0a-a88e-2088b826a570",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-93f4b207-0e0b-4b0a-a88e-2088b826a570.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"10238fa39bf0e212b3dd5d881ce7be66\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F74BA:1299DF:5E558589"
-    }
-  },
-  "uuid": "93f4b207-0e0b-4b0a-a88e-2088b826a570",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..af39319ca4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,50 @@
+{
+  "id": "93f4b207-0e0b-4b0a-a88e-2088b826a570",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"10238fa39bf0e212b3dd5d881ce7be66\"",
+      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F74BA:1299DF:5E558589"
+    }
+  },
+  "uuid": "93f4b207-0e0b-4b0a-a88e-2088b826a570",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1-1520ef.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1-1520ef.json
deleted file mode 100644
index dd17462134..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1-1520ef.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1520ef6e-b895-49bb-955e-0a0678e36010",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-1520ef6e-b895-49bb-955e-0a0678e36010.json",
-    "headers": {
-      "Date": "Tue, 25 Feb 2020 20:37:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "1582663454",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"80993e430cddb2ddfdcd638da234e506\"",
-      "Last-Modified": "Tue, 25 Feb 2020 20:22:36 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D970:3D9A:F749D:1299BA:5E558586"
-    }
-  },
-  "uuid": "1520ef6e-b895-49bb-955e-0a0678e36010",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1.json
new file mode 100644
index 0000000000..90630f5fdb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setDeleteBranchOnMerge/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "1520ef6e-b895-49bb-955e-0a0678e36010",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 25 Feb 2020 20:37:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "1582663454",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"80993e430cddb2ddfdcd638da234e506\"",
+      "Last-Modified": "Tue, 25 Feb 2020 20:22:36 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D970:3D9A:F749D:1299BA:5E558586"
+    }
+  },
+  "uuid": "1520ef6e-b895-49bb-955e-0a0678e36010",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-3c8120ed-2ea0-4228-8639-7159cc73d23b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-3c8120ed-2ea0-4228-8639-7159cc73d23b.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-0d8d7ebb-f978-4af9-b545-4b301a52d7c7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-0d8d7ebb-f978-4af9-b545-4b301a52d7c7.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-3e3a54cc-fd38-4fd5-b5d1-d998d45be38c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-3e3a54cc-fd38-4fd5-b5d1-d998d45be38c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-200ab5e0-f5fd-4d4c-937f-b3798acb31cf.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-200ab5e0-f5fd-4d4c-937f-b3798acb31cf.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-036019d5-fdf5-4936-b85a-3e2d6c8585f3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-036019d5-fdf5-4936-b85a-3e2d6c8585f3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-4de721aa-c26b-4df7-a87e-67b440454149.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-4de721aa-c26b-4df7-a87e-67b440454149.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-265263e7-6c87-4d23-b83f-12e2c6fceba4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-265263e7-6c87-4d23-b83f-12e2c6fceba4.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-d82ad1a3-76bb-4f88-8b6a-097195313516.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-d82ad1a3-76bb-4f88-8b6a-097195313516.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-6224e039-5be4-4fd9-8a6d-8756a393c94d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-6224e039-5be4-4fd9-8a6d-8756a393c94d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/repos_github-api-test-org_temp-setmergeoptions-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/user-b42d2004-5fb5-415d-96ff-d9c628b799f3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/user-b42d2004-5fb5-415d-96ff-d9c628b799f3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10-3c8120.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10-3c8120.json
deleted file mode 100644
index a17ea073a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10-3c8120.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "3c8120ed-2ea0-4228-8639-7159cc73d23b",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-3c8120ed-2ea0-4228-8639-7159cc73d23b.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 09 Oct 2019 20:35:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4752",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"7eb031a9c26906a5a19e00c92f308fdd\"",
-      "Last-Modified": "Wed, 09 Oct 2019 20:35:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DB2:DD38A4:5D9E448F"
-    }
-  },
-  "uuid": "3c8120ed-2ea0-4228-8639-7159cc73d23b",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-setMergeOptions",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-3",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10.json
new file mode 100644
index 0000000000..4dfb474e75
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-10.json
@@ -0,0 +1,47 @@
+{
+  "id": "3c8120ed-2ea0-4228-8639-7159cc73d23b",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-10.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 09 Oct 2019 20:35:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4752",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"7eb031a9c26906a5a19e00c92f308fdd\"",
+      "Last-Modified": "Wed, 09 Oct 2019 20:35:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DB2:DD38A4:5D9E448F"
+    }
+  },
+  "uuid": "3c8120ed-2ea0-4228-8639-7159cc73d23b",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-setMergeOptions",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-3",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2-0d8d7e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2-0d8d7e.json
deleted file mode 100644
index c0fb204ad9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2-0d8d7e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0d8d7ebb-f978-4af9-b545-4b301a52d7c7",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-0d8d7ebb-f978-4af9-b545-4b301a52d7c7.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 09 Oct 2019 20:35:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4760",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"b246bb8e7b45babe39126cd7d4fe643c\"",
-      "Last-Modified": "Wed, 09 Oct 2019 20:35:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740D9E:DD37FB:5D9E4487"
-    }
-  },
-  "uuid": "0d8d7ebb-f978-4af9-b545-4b301a52d7c7",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-setMergeOptions",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2.json
new file mode 100644
index 0000000000..36fdc739ca
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "0d8d7ebb-f978-4af9-b545-4b301a52d7c7",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 09 Oct 2019 20:35:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4760",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"b246bb8e7b45babe39126cd7d4fe643c\"",
+      "Last-Modified": "Wed, 09 Oct 2019 20:35:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740D9E:DD37FB:5D9E4487"
+    }
+  },
+  "uuid": "0d8d7ebb-f978-4af9-b545-4b301a52d7c7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-setMergeOptions",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3-3e3a54.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3-3e3a54.json
deleted file mode 100644
index 82b8af6ee5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3-3e3a54.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "3e3a54cc-fd38-4fd5-b5d1-d998d45be38c",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"allow_squash_merge\":\"true\",\"name\":\"temp-setMergeOptions\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-3e3a54cc-fd38-4fd5-b5d1-d998d45be38c.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4759",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b246bb8e7b45babe39126cd7d4fe643c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DA0:DD3886:5D9E448E"
-    }
-  },
-  "uuid": "3e3a54cc-fd38-4fd5-b5d1-d998d45be38c",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3.json
new file mode 100644
index 0000000000..cae7381b15
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-3.json
@@ -0,0 +1,54 @@
+{
+  "id": "3e3a54cc-fd38-4fd5-b5d1-d998d45be38c",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"allow_squash_merge\":\"true\",\"name\":\"temp-setMergeOptions\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-3.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4759",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b246bb8e7b45babe39126cd7d4fe643c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DA0:DD3886:5D9E448E"
+    }
+  },
+  "uuid": "3e3a54cc-fd38-4fd5-b5d1-d998d45be38c",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4-200ab5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4-200ab5.json
deleted file mode 100644
index 47dd794078..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4-200ab5.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "200ab5e0-f5fd-4d4c-937f-b3798acb31cf",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"allow_merge_commit\":\"false\",\"name\":\"temp-setMergeOptions\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-200ab5e0-f5fd-4d4c-937f-b3798acb31cf.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4758",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9390b49fb5cfbb68c250633265af0b40\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DA3:DD3887:5D9E448E"
-    }
-  },
-  "uuid": "200ab5e0-f5fd-4d4c-937f-b3798acb31cf",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4.json
new file mode 100644
index 0000000000..41dd2d6895
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "200ab5e0-f5fd-4d4c-937f-b3798acb31cf",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"allow_merge_commit\":\"false\",\"name\":\"temp-setMergeOptions\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-4.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4758",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9390b49fb5cfbb68c250633265af0b40\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DA3:DD3887:5D9E448E"
+    }
+  },
+  "uuid": "200ab5e0-f5fd-4d4c-937f-b3798acb31cf",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5-036019.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5-036019.json
deleted file mode 100644
index 2a91ae58d4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5-036019.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "036019d5-fdf5-4936-b85a-3e2d6c8585f3",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"temp-setMergeOptions\",\"allow_rebase_merge\":\"false\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-036019d5-fdf5-4936-b85a-3e2d6c8585f3.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4757",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"9b6a5b60f9f5940540226c138cadaa94\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DA5:DD388A:5D9E448E"
-    }
-  },
-  "uuid": "036019d5-fdf5-4936-b85a-3e2d6c8585f3",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5.json
new file mode 100644
index 0000000000..644845d1e9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "036019d5-fdf5-4936-b85a-3e2d6c8585f3",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"temp-setMergeOptions\",\"allow_rebase_merge\":\"false\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-5.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4757",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"9b6a5b60f9f5940540226c138cadaa94\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DA5:DD388A:5D9E448E"
+    }
+  },
+  "uuid": "036019d5-fdf5-4936-b85a-3e2d6c8585f3",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6-4de721.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6-4de721.json
deleted file mode 100644
index 266cda6479..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6-4de721.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "4de721aa-c26b-4df7-a87e-67b440454149",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-4de721aa-c26b-4df7-a87e-67b440454149.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4756",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9b6a5b60f9f5940540226c138cadaa94\"",
-      "Last-Modified": "Wed, 09 Oct 2019 20:35:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DAA:DD3896:5D9E448F"
-    }
-  },
-  "uuid": "4de721aa-c26b-4df7-a87e-67b440454149",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-setMergeOptions",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-3",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6.json
new file mode 100644
index 0000000000..3adecfd67d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "4de721aa-c26b-4df7-a87e-67b440454149",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-6.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4756",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9b6a5b60f9f5940540226c138cadaa94\"",
+      "Last-Modified": "Wed, 09 Oct 2019 20:35:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DAA:DD3896:5D9E448F"
+    }
+  },
+  "uuid": "4de721aa-c26b-4df7-a87e-67b440454149",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-setMergeOptions",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-setMergeOptions-3",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7-265263.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7-265263.json
deleted file mode 100644
index 9305e14e86..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7-265263.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "265263e7-6c87-4d23-b83f-12e2c6fceba4",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"allow_merge_commit\":\"true\",\"name\":\"temp-setMergeOptions\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-265263e7-6c87-4d23-b83f-12e2c6fceba4.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4755",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9652316fc6a6471e4a0be218273540ff\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DAB:DD389A:5D9E448F"
-    }
-  },
-  "uuid": "265263e7-6c87-4d23-b83f-12e2c6fceba4",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7.json
new file mode 100644
index 0000000000..e1cf35f82f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-7.json
@@ -0,0 +1,54 @@
+{
+  "id": "265263e7-6c87-4d23-b83f-12e2c6fceba4",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"allow_merge_commit\":\"true\",\"name\":\"temp-setMergeOptions\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-7.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4755",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9652316fc6a6471e4a0be218273540ff\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DAB:DD389A:5D9E448F"
+    }
+  },
+  "uuid": "265263e7-6c87-4d23-b83f-12e2c6fceba4",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8-d82ad1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8-d82ad1.json
deleted file mode 100644
index 09b3d98d72..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8-d82ad1.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "d82ad1a3-76bb-4f88-8b6a-097195313516",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"temp-setMergeOptions\",\"allow_rebase_merge\":\"true\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-d82ad1a3-76bb-4f88-8b6a-097195313516.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4754",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b246bb8e7b45babe39126cd7d4fe643c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DAD:DD389B:5D9E448F"
-    }
-  },
-  "uuid": "d82ad1a3-76bb-4f88-8b6a-097195313516",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8.json
new file mode 100644
index 0000000000..0aa92b6a58
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-8.json
@@ -0,0 +1,54 @@
+{
+  "id": "d82ad1a3-76bb-4f88-8b6a-097195313516",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"temp-setMergeOptions\",\"allow_rebase_merge\":\"true\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-8.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4754",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b246bb8e7b45babe39126cd7d4fe643c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DAD:DD389B:5D9E448F"
+    }
+  },
+  "uuid": "d82ad1a3-76bb-4f88-8b6a-097195313516",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9-6224e0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9-6224e0.json
deleted file mode 100644
index d1ae35cd50..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9-6224e0.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "6224e039-5be4-4fd9-8a6d-8756a393c94d",
-  "name": "repos_github-api-test-org_temp-setmergeoptions",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-setMergeOptions",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"allow_squash_merge\":\"false\",\"name\":\"temp-setMergeOptions\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-6224e039-5be4-4fd9-8a6d-8756a393c94d.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4753",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"7eb031a9c26906a5a19e00c92f308fdd\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740DAF:DD389F:5D9E448F"
-    }
-  },
-  "uuid": "6224e039-5be4-4fd9-8a6d-8756a393c94d",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9.json
new file mode 100644
index 0000000000..a898eac5b0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/repos_github-api-test-org_temp-setmergeoptions-9.json
@@ -0,0 +1,51 @@
+{
+  "id": "6224e039-5be4-4fd9-8a6d-8756a393c94d",
+  "name": "repos_github-api-test-org_temp-setmergeoptions",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-setMergeOptions",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"allow_squash_merge\":\"false\",\"name\":\"temp-setMergeOptions\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-setmergeoptions-9.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Wed, 09 Oct 2019 20:35:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4753",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"7eb031a9c26906a5a19e00c92f308fdd\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740DAF:DD389F:5D9E448F"
+    }
+  },
+  "uuid": "6224e039-5be4-4fd9-8a6d-8756a393c94d",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1-b42d20.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1-b42d20.json
deleted file mode 100644
index df559c0c16..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1-b42d20.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b42d2004-5fb5-415d-96ff-d9c628b799f3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b42d2004-5fb5-415d-96ff-d9c628b799f3.json",
-    "headers": {
-      "Date": "Wed, 09 Oct 2019 20:35:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4768",
-      "X-RateLimit-Reset": "1570656117",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f10545b81d574e5b3170d6ee67e622c7\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CCBD:55D1:740D5C:DD37F4:5D9E4487"
-    }
-  },
-  "uuid": "b42d2004-5fb5-415d-96ff-d9c628b799f3",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1.json
new file mode 100644
index 0000000000..c764bbfd44
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/setMergeOptions/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b42d2004-5fb5-415d-96ff-d9c628b799f3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 09 Oct 2019 20:35:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4768",
+      "X-RateLimit-Reset": "1570656117",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f10545b81d574e5b3170d6ee67e622c7\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CCBD:55D1:740D5C:DD37F4:5D9E4487"
+    }
+  },
+  "uuid": "b42d2004-5fb5-415d-96ff-d9c628b799f3",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/orgs_github-api-test-org-564bceaa-c92a-442f-af3e-4659fa38b3e0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/orgs_github-api-test-org-564bceaa-c92a-442f-af3e-4659fa38b3e0.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/repos_github-api-test-org_github-api-5861f3bb-636a-4c2d-8748-b7d7f95f26a0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/repos_github-api-test-org_github-api-5861f3bb-636a-4c2d-8748-b7d7f95f26a0.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/user-77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/user-77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2-564bce.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2-564bce.json
deleted file mode 100644
index 54630d5df0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2-564bce.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "564bceaa-c92a-442f-af3e-4659fa38b3e0",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-564bceaa-c92a-442f-af3e-4659fa38b3e0.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4908",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1f1da50f358ccc41c1f6f864b3de2798\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F360:3620:11B62BB:1537066:5D964446"
-    }
-  },
-  "uuid": "564bceaa-c92a-442f-af3e-4659fa38b3e0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..6da8f5ddf1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "564bceaa-c92a-442f-af3e-4659fa38b3e0",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4908",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1f1da50f358ccc41c1f6f864b3de2798\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F360:3620:11B62BB:1537066:5D964446"
+    }
+  },
+  "uuid": "564bceaa-c92a-442f-af3e-4659fa38b3e0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3-5861f3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3-5861f3.json
deleted file mode 100644
index c588f79bb6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3-5861f3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5861f3bb-636a-4c2d-8748-b7d7f95f26a0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-5861f3bb-636a-4c2d-8748-b7d7f95f26a0.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4907",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f2e5ff84c604193d0199f717285eac5e\"",
-      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F360:3620:11B62C9:1537091:5D964446"
-    }
-  },
-  "uuid": "5861f3bb-636a-4c2d-8748-b7d7f95f26a0",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..7fa85ddf0d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "5861f3bb-636a-4c2d-8748-b7d7f95f26a0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4907",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f2e5ff84c604193d0199f717285eac5e\"",
+      "Last-Modified": "Mon, 30 Sep 2019 22:36:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F360:3620:11B62C9:1537091:5D964446"
+    }
+  },
+  "uuid": "5861f3bb-636a-4c2d-8748-b7d7f95f26a0",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-4-d888ea.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-4-d888ea.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-5-b8ab91.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-5-b8ab91.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-6-7de879.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-6-7de879.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-7-50d81d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-7-50d81d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/repos_github-api-test-org_github-api_subscription-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1-77d1bd.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1-77d1bd.json
deleted file mode 100644
index a775ad541f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1-77d1bd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4910",
-      "X-RateLimit-Reset": "1570132527",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F360:3620:11B6297:153704F:5D964446"
-    }
-  },
-  "uuid": "77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1.json
new file mode 100644
index 0000000000..7547187388
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/subscription/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 18:56:06 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1570132527",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F360:3620:11B6297:153704F:5D964446"
+    }
+  },
+  "uuid": "77d1bdbf-ff00-49d6-abdf-bc5c3d6de17a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api-159ce759-42c4-4141-a31f-c66a04e7d46c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api-159ce759-42c4-4141-a31f-c66a04e7d46c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents-07f37d0d-06c1-4077-b3de-ca6be4206dc6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents-07f37d0d-06c1-4077-b3de-ca6be4206dc6.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_cname-7ccd6fc3-6a14-4d0c-9493-25c060f5a826.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_cname-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_cname-7ccd6fc3-6a14-4d0c-9493-25c060f5a826.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_cname-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependencieshtml-e65843d5-ae12-4571-bc20-10b2a749c4c4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependencieshtml-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependencieshtml-e65843d5-ae12-4571-bc20-10b2a749c4c4.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependencieshtml-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-convergencehtml-2711f47a-83b4-4141-93d3-a0a5ed1b4f66.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-convergencehtml-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-convergencehtml-2711f47a-83b4-4141-93d3-a0a5ed1b4f66.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-convergencehtml-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-infohtml-b8795612-0b73-44e5-8ce9-99633f2657ea.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-infohtml-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-infohtml-b8795612-0b73-44e5-8ce9-99633f2657ea.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_dependency-infohtml-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_distribution-managementhtml-8aba06cb-6fe6-4236-9cba-64c33018cdb7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_distribution-managementhtml-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_distribution-managementhtml-8aba06cb-6fe6-4236-9cba-64c33018cdb7.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_distribution-managementhtml-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_indexhtml-699687aa-17e3-479a-a70b-26fd50ecd6ae.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_indexhtml-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_indexhtml-699687aa-17e3-479a-a70b-26fd50ecd6ae.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_indexhtml-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_integrationhtml-f6bbfab2-699a-4434-804c-70f76610836e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_integrationhtml-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_integrationhtml-f6bbfab2-699a-4434-804c-70f76610836e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_integrationhtml-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_issue-trackinghtml-5be48b92-90ac-421d-bb90-81a7bd16bf4d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_issue-trackinghtml-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_issue-trackinghtml-5be48b92-90ac-421d-bb90-81a7bd16bf4d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_issue-trackinghtml-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_licensehtml-e6c4a515-269e-4098-a739-4d04302abca9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_licensehtml-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_licensehtml-e6c4a515-269e-4098-a739-4d04302abca9.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_licensehtml-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_mail-listshtml-9fa1b590-dcd7-421a-97fc-5c46754c2c80.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_mail-listshtml-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_mail-listshtml-9fa1b590-dcd7-421a-97fc-5c46754c2c80.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_mail-listshtml-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_plugin-managementhtml-933e0254-7548-4d8b-a94f-e0dcef8afaf9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_plugin-managementhtml-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_plugin-managementhtml-933e0254-7548-4d8b-a94f-e0dcef8afaf9.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_plugin-managementhtml-14.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_pluginshtml-ee7e46e7-9b8f-4df4-aacd-92228c8d284f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_pluginshtml-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_pluginshtml-ee7e46e7-9b8f-4df4-aacd-92228c8d284f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_pluginshtml-15.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-infohtml-eed0ad79-661a-4b20-a4a1-1bcd44d8af3d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-infohtml-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-infohtml-eed0ad79-661a-4b20-a4a1-1bcd44d8af3d.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-infohtml-16.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-reportshtml-64d11c32-506a-4275-a050-4d268256bf6c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-reportshtml-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-reportshtml-64d11c32-506a-4275-a050-4d268256bf6c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-reportshtml-17.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-summaryhtml-c278dd7b-34e7-452e-83ae-d390638bbe38.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-summaryhtml-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-summaryhtml-c278dd7b-34e7-452e-83ae-d390638bbe38.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_project-summaryhtml-18.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_source-repositoryhtml-dfae6054-83b7-4095-99dc-f497ef58044a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_source-repositoryhtml-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_source-repositoryhtml-dfae6054-83b7-4095-99dc-f497ef58044a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_source-repositoryhtml-19.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_team-listhtml-69298281-9045-4dd4-8934-ac0a43157ef7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_team-listhtml-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_team-listhtml-69298281-9045-4dd4-8934-ac0a43157ef7.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/repos_github-api_github-api_contents_team-listhtml-20.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/user-656249de-1113-417e-8ea0-ce0930482f4a.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/user-656249de-1113-417e-8ea0-ce0930482f4a.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2-159ce7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2-159ce7.json
deleted file mode 100644
index 867971286e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2-159ce7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "159ce759-42c4-4141-a31f-c66a04e7d46c",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-159ce759-42c4-4141-a31f-c66a04e7d46c.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4864",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b359e0502299a07474385dbb4d0d9dbf\"",
-      "Last-Modified": "Sun, 06 Oct 2019 02:40:00 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913DA4:30C4BE5:5D9B9CD8"
-    }
-  },
-  "uuid": "159ce759-42c4-4141-a31f-c66a04e7d46c",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..d18523154d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "159ce759-42c4-4141-a31f-c66a04e7d46c",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4864",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b359e0502299a07474385dbb4d0d9dbf\"",
+      "Last-Modified": "Sun, 06 Oct 2019 02:40:00 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913DA4:30C4BE5:5D9B9CD8"
+    }
+  },
+  "uuid": "159ce759-42c4-4141-a31f-c66a04e7d46c",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3-07f37d.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3-07f37d.json
deleted file mode 100644
index 6860a6d5cc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3-07f37d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "07f37d0d-06c1-4077-b3de-ca6be4206dc6",
-  "name": "repos_github-api_github-api_contents",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents-07f37d0d-06c1-4077-b3de-ca6be4206dc6.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4863",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1c2ae2aca184f50396d8d9463dce386ba4b7550c\"",
-      "Last-Modified": "Sun, 06 Oct 2019 02:40:00 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913DB7:30C4C25:5D9B9CD9"
-    }
-  },
-  "uuid": "07f37d0d-06c1-4077-b3de-ca6be4206dc6",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3.json
new file mode 100644
index 0000000000..b84cafc0d1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "07f37d0d-06c1-4077-b3de-ca6be4206dc6",
+  "name": "repos_github-api_github-api_contents",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4863",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1c2ae2aca184f50396d8d9463dce386ba4b7550c\"",
+      "Last-Modified": "Sun, 06 Oct 2019 02:40:00 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913DB7:30C4C25:5D9B9CD9"
+    }
+  },
+  "uuid": "07f37d0d-06c1-4077-b3de-ca6be4206dc6",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4-7ccd6f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4-7ccd6f.json
deleted file mode 100644
index b3bef7a2e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4-7ccd6f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7ccd6fc3-6a14-4d0c-9493-25c060f5a826",
-  "name": "repos_github-api_github-api_contents_cname",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/CNAME?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_cname-7ccd6fc3-6a14-4d0c-9493-25c060f5a826.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4862",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b54f5a6e2976e5e0ea312837006e9b2b3378f99c\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913DCE:30C4C39:5D9B9CD9"
-    }
-  },
-  "uuid": "7ccd6fc3-6a14-4d0c-9493-25c060f5a826",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4.json
new file mode 100644
index 0000000000..5f08c09531
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_cname-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "7ccd6fc3-6a14-4d0c-9493-25c060f5a826",
+  "name": "repos_github-api_github-api_contents_cname",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/CNAME?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_cname-4.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4862",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b54f5a6e2976e5e0ea312837006e9b2b3378f99c\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913DCE:30C4C39:5D9B9CD9"
+    }
+  },
+  "uuid": "7ccd6fc3-6a14-4d0c-9493-25c060f5a826",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5-e65843.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5-e65843.json
deleted file mode 100644
index eb36a01352..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5-e65843.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e65843d5-ae12-4571-bc20-10b2a749c4c4",
-  "name": "repos_github-api_github-api_contents_dependencieshtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/dependencies.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_dependencieshtml-e65843d5-ae12-4571-bc20-10b2a749c4c4.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4861",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5c870e1a8f7e21eb8d386e3cfc146b5718a6020a\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913DDA:30C4C50:5D9B9CD9"
-    }
-  },
-  "uuid": "e65843d5-ae12-4571-bc20-10b2a749c4c4",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5.json
new file mode 100644
index 0000000000..013d2c97d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependencieshtml-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "e65843d5-ae12-4571-bc20-10b2a749c4c4",
+  "name": "repos_github-api_github-api_contents_dependencieshtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/dependencies.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_dependencieshtml-5.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4861",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5c870e1a8f7e21eb8d386e3cfc146b5718a6020a\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913DDA:30C4C50:5D9B9CD9"
+    }
+  },
+  "uuid": "e65843d5-ae12-4571-bc20-10b2a749c4c4",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6-2711f4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6-2711f4.json
deleted file mode 100644
index 68c2ace448..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6-2711f4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2711f47a-83b4-4141-93d3-a0a5ed1b4f66",
-  "name": "repos_github-api_github-api_contents_dependency-convergencehtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/dependency-convergence.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_dependency-convergencehtml-2711f47a-83b4-4141-93d3-a0a5ed1b4f66.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4860",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5c2a3be517645c95003e1005ea62ffd23a039996\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913DEF:30C4C65:5D9B9CDA"
-    }
-  },
-  "uuid": "2711f47a-83b4-4141-93d3-a0a5ed1b4f66",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6.json
new file mode 100644
index 0000000000..fc9c66469f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-convergencehtml-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "2711f47a-83b4-4141-93d3-a0a5ed1b4f66",
+  "name": "repos_github-api_github-api_contents_dependency-convergencehtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/dependency-convergence.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_dependency-convergencehtml-6.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4860",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5c2a3be517645c95003e1005ea62ffd23a039996\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913DEF:30C4C65:5D9B9CDA"
+    }
+  },
+  "uuid": "2711f47a-83b4-4141-93d3-a0a5ed1b4f66",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7-b87956.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7-b87956.json
deleted file mode 100644
index af81bed4ed..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7-b87956.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b8795612-0b73-44e5-8ce9-99633f2657ea",
-  "name": "repos_github-api_github-api_contents_dependency-infohtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/dependency-info.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_dependency-infohtml-b8795612-0b73-44e5-8ce9-99633f2657ea.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4859",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"29e0151565943e6cfa05193b19c0de251b82dad6\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E04:30C4C84:5D9B9CDA"
-    }
-  },
-  "uuid": "b8795612-0b73-44e5-8ce9-99633f2657ea",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7.json
new file mode 100644
index 0000000000..79ac5c5b9f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_dependency-infohtml-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "b8795612-0b73-44e5-8ce9-99633f2657ea",
+  "name": "repos_github-api_github-api_contents_dependency-infohtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/dependency-info.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_dependency-infohtml-7.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4859",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"29e0151565943e6cfa05193b19c0de251b82dad6\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E04:30C4C84:5D9B9CDA"
+    }
+  },
+  "uuid": "b8795612-0b73-44e5-8ce9-99633f2657ea",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8-8aba06.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8-8aba06.json
deleted file mode 100644
index 4404c6eba6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8-8aba06.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "8aba06cb-6fe6-4236-9cba-64c33018cdb7",
-  "name": "repos_github-api_github-api_contents_distribution-managementhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/distribution-management.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_distribution-managementhtml-8aba06cb-6fe6-4236-9cba-64c33018cdb7.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4858",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"012177489e014fb0b26f4871bf7d9df48c2d76e4\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E17:30C4C9B:5D9B9CDA"
-    }
-  },
-  "uuid": "8aba06cb-6fe6-4236-9cba-64c33018cdb7",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8.json
new file mode 100644
index 0000000000..4420616813
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_distribution-managementhtml-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "8aba06cb-6fe6-4236-9cba-64c33018cdb7",
+  "name": "repos_github-api_github-api_contents_distribution-managementhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/distribution-management.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_distribution-managementhtml-8.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4858",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"012177489e014fb0b26f4871bf7d9df48c2d76e4\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E17:30C4C9B:5D9B9CDA"
+    }
+  },
+  "uuid": "8aba06cb-6fe6-4236-9cba-64c33018cdb7",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9-699687.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9-699687.json
deleted file mode 100644
index 7319527401..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9-699687.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "699687aa-17e3-479a-a70b-26fd50ecd6ae",
-  "name": "repos_github-api_github-api_contents_indexhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/index.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_indexhtml-699687aa-17e3-479a-a70b-26fd50ecd6ae.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4857",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"515047a8cb309d64be194a0ace36cf4c52e26ebc\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E26:30C4CB0:5D9B9CDA"
-    }
-  },
-  "uuid": "699687aa-17e3-479a-a70b-26fd50ecd6ae",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9.json
new file mode 100644
index 0000000000..cd6062c668
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_indexhtml-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "699687aa-17e3-479a-a70b-26fd50ecd6ae",
+  "name": "repos_github-api_github-api_contents_indexhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/index.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_indexhtml-9.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4857",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"515047a8cb309d64be194a0ace36cf4c52e26ebc\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E26:30C4CB0:5D9B9CDA"
+    }
+  },
+  "uuid": "699687aa-17e3-479a-a70b-26fd50ecd6ae",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10-f6bbfa.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10-f6bbfa.json
deleted file mode 100644
index 9e7ad953c0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10-f6bbfa.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f6bbfab2-699a-4434-804c-70f76610836e",
-  "name": "repos_github-api_github-api_contents_integrationhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/integration.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_integrationhtml-f6bbfab2-699a-4434-804c-70f76610836e.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4856",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c2f94c57aed2bf09413d68f1265a79534fd95d5c\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E34:30C4CC5:5D9B9CDA"
-    }
-  },
-  "uuid": "f6bbfab2-699a-4434-804c-70f76610836e",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10.json
new file mode 100644
index 0000000000..42d0d85092
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_integrationhtml-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "f6bbfab2-699a-4434-804c-70f76610836e",
+  "name": "repos_github-api_github-api_contents_integrationhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/integration.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_integrationhtml-10.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4856",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c2f94c57aed2bf09413d68f1265a79534fd95d5c\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E34:30C4CC5:5D9B9CDA"
+    }
+  },
+  "uuid": "f6bbfab2-699a-4434-804c-70f76610836e",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11-5be48b.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11-5be48b.json
deleted file mode 100644
index a1663c5cc9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11-5be48b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5be48b92-90ac-421d-bb90-81a7bd16bf4d",
-  "name": "repos_github-api_github-api_contents_issue-trackinghtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/issue-tracking.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_issue-trackinghtml-5be48b92-90ac-421d-bb90-81a7bd16bf4d.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4855",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ac832e2a65dc31d3ead0b5dd61365a044ad76c3f\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E48:30C4CD6:5D9B9CDB"
-    }
-  },
-  "uuid": "5be48b92-90ac-421d-bb90-81a7bd16bf4d",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11.json
new file mode 100644
index 0000000000..82ff6c019b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_issue-trackinghtml-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "5be48b92-90ac-421d-bb90-81a7bd16bf4d",
+  "name": "repos_github-api_github-api_contents_issue-trackinghtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/issue-tracking.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_issue-trackinghtml-11.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4855",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ac832e2a65dc31d3ead0b5dd61365a044ad76c3f\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E48:30C4CD6:5D9B9CDB"
+    }
+  },
+  "uuid": "5be48b92-90ac-421d-bb90-81a7bd16bf4d",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12-e6c4a5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12-e6c4a5.json
deleted file mode 100644
index da09aca392..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12-e6c4a5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e6c4a515-269e-4098-a739-4d04302abca9",
-  "name": "repos_github-api_github-api_contents_licensehtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/license.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_licensehtml-e6c4a515-269e-4098-a739-4d04302abca9.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4854",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"078dbdbf8e234664d36b831b1cbaa2787c3758af\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E56:30C4CE9:5D9B9CDB"
-    }
-  },
-  "uuid": "e6c4a515-269e-4098-a739-4d04302abca9",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12.json
new file mode 100644
index 0000000000..194be49bbf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_licensehtml-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "e6c4a515-269e-4098-a739-4d04302abca9",
+  "name": "repos_github-api_github-api_contents_licensehtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/license.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_licensehtml-12.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4854",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"078dbdbf8e234664d36b831b1cbaa2787c3758af\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E56:30C4CE9:5D9B9CDB"
+    }
+  },
+  "uuid": "e6c4a515-269e-4098-a739-4d04302abca9",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13-9fa1b5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13-9fa1b5.json
deleted file mode 100644
index 39e7bf4507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13-9fa1b5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9fa1b590-dcd7-421a-97fc-5c46754c2c80",
-  "name": "repos_github-api_github-api_contents_mail-listshtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/mail-lists.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_mail-listshtml-9fa1b590-dcd7-421a-97fc-5c46754c2c80.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4853",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8de53775c5bb7e6a6b9be51efd6be918b44f6aed\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E73:30C4D10:5D9B9CDB"
-    }
-  },
-  "uuid": "9fa1b590-dcd7-421a-97fc-5c46754c2c80",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13.json
new file mode 100644
index 0000000000..5c80f2be9f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_mail-listshtml-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "9fa1b590-dcd7-421a-97fc-5c46754c2c80",
+  "name": "repos_github-api_github-api_contents_mail-listshtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/mail-lists.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_mail-listshtml-13.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4853",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8de53775c5bb7e6a6b9be51efd6be918b44f6aed\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E73:30C4D10:5D9B9CDB"
+    }
+  },
+  "uuid": "9fa1b590-dcd7-421a-97fc-5c46754c2c80",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14-933e02.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14-933e02.json
deleted file mode 100644
index 2dae1609c4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14-933e02.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "933e0254-7548-4d8b-a94f-e0dcef8afaf9",
-  "name": "repos_github-api_github-api_contents_plugin-managementhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/plugin-management.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_plugin-managementhtml-933e0254-7548-4d8b-a94f-e0dcef8afaf9.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4852",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8222800d6ff2521f8cf1da476495a9ac9df18eda\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E87:30C4D29:5D9B9CDB"
-    }
-  },
-  "uuid": "933e0254-7548-4d8b-a94f-e0dcef8afaf9",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14.json
new file mode 100644
index 0000000000..b928067847
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_plugin-managementhtml-14.json
@@ -0,0 +1,48 @@
+{
+  "id": "933e0254-7548-4d8b-a94f-e0dcef8afaf9",
+  "name": "repos_github-api_github-api_contents_plugin-managementhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/plugin-management.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_plugin-managementhtml-14.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4852",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8222800d6ff2521f8cf1da476495a9ac9df18eda\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E87:30C4D29:5D9B9CDB"
+    }
+  },
+  "uuid": "933e0254-7548-4d8b-a94f-e0dcef8afaf9",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15-ee7e46.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15-ee7e46.json
deleted file mode 100644
index 79fa24bfb7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15-ee7e46.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ee7e46e7-9b8f-4df4-aacd-92228c8d284f",
-  "name": "repos_github-api_github-api_contents_pluginshtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/plugins.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_pluginshtml-ee7e46e7-9b8f-4df4-aacd-92228c8d284f.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4851",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"36f588bf0319c029d9f0702a53888f3c8550d405\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913E96:30C4D3A:5D9B9CDC"
-    }
-  },
-  "uuid": "ee7e46e7-9b8f-4df4-aacd-92228c8d284f",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15.json
new file mode 100644
index 0000000000..242b36c0cd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_pluginshtml-15.json
@@ -0,0 +1,48 @@
+{
+  "id": "ee7e46e7-9b8f-4df4-aacd-92228c8d284f",
+  "name": "repos_github-api_github-api_contents_pluginshtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/plugins.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_pluginshtml-15.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4851",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"36f588bf0319c029d9f0702a53888f3c8550d405\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913E96:30C4D3A:5D9B9CDC"
+    }
+  },
+  "uuid": "ee7e46e7-9b8f-4df4-aacd-92228c8d284f",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16-eed0ad.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16-eed0ad.json
deleted file mode 100644
index 9bd1b57276..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16-eed0ad.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "eed0ad79-661a-4b20-a4a1-1bcd44d8af3d",
-  "name": "repos_github-api_github-api_contents_project-infohtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/project-info.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_project-infohtml-eed0ad79-661a-4b20-a4a1-1bcd44d8af3d.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4850",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"390c7a4d52f8a77158486c330bf0a1fce704c5f3\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913EA7:30C4D4F:5D9B9CDC"
-    }
-  },
-  "uuid": "eed0ad79-661a-4b20-a4a1-1bcd44d8af3d",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16.json
new file mode 100644
index 0000000000..d341fa51b9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-infohtml-16.json
@@ -0,0 +1,48 @@
+{
+  "id": "eed0ad79-661a-4b20-a4a1-1bcd44d8af3d",
+  "name": "repos_github-api_github-api_contents_project-infohtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/project-info.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_project-infohtml-16.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4850",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"390c7a4d52f8a77158486c330bf0a1fce704c5f3\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913EA7:30C4D4F:5D9B9CDC"
+    }
+  },
+  "uuid": "eed0ad79-661a-4b20-a4a1-1bcd44d8af3d",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17-64d11c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17-64d11c.json
deleted file mode 100644
index fc8bf09136..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17-64d11c.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "64d11c32-506a-4275-a050-4d268256bf6c",
-  "name": "repos_github-api_github-api_contents_project-reportshtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/project-reports.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_project-reportshtml-64d11c32-506a-4275-a050-4d268256bf6c.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4849",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0f860eb86978834a817c60f315bbecaf0ebb3ee1\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913EB8:30C4D66:5D9B9CDC"
-    }
-  },
-  "uuid": "64d11c32-506a-4275-a050-4d268256bf6c",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17.json
new file mode 100644
index 0000000000..b9b45e2202
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-reportshtml-17.json
@@ -0,0 +1,48 @@
+{
+  "id": "64d11c32-506a-4275-a050-4d268256bf6c",
+  "name": "repos_github-api_github-api_contents_project-reportshtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/project-reports.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_project-reportshtml-17.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4849",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0f860eb86978834a817c60f315bbecaf0ebb3ee1\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913EB8:30C4D66:5D9B9CDC"
+    }
+  },
+  "uuid": "64d11c32-506a-4275-a050-4d268256bf6c",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18-c278dd.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18-c278dd.json
deleted file mode 100644
index af83da17a1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18-c278dd.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c278dd7b-34e7-452e-83ae-d390638bbe38",
-  "name": "repos_github-api_github-api_contents_project-summaryhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/project-summary.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_project-summaryhtml-c278dd7b-34e7-452e-83ae-d390638bbe38.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4848",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4523d59f34d5f9581bb2ec50cd36a1e48e0fe6fd\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913ECF:30C4D7A:5D9B9CDC"
-    }
-  },
-  "uuid": "c278dd7b-34e7-452e-83ae-d390638bbe38",
-  "persistent": true,
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18.json
new file mode 100644
index 0000000000..05232dcaf6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_project-summaryhtml-18.json
@@ -0,0 +1,48 @@
+{
+  "id": "c278dd7b-34e7-452e-83ae-d390638bbe38",
+  "name": "repos_github-api_github-api_contents_project-summaryhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/project-summary.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_project-summaryhtml-18.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4848",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4523d59f34d5f9581bb2ec50cd36a1e48e0fe6fd\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913ECF:30C4D7A:5D9B9CDC"
+    }
+  },
+  "uuid": "c278dd7b-34e7-452e-83ae-d390638bbe38",
+  "persistent": true,
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19-dfae60.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19-dfae60.json
deleted file mode 100644
index 02eceba6d0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19-dfae60.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "dfae6054-83b7-4095-99dc-f497ef58044a",
-  "name": "repos_github-api_github-api_contents_source-repositoryhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/source-repository.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_source-repositoryhtml-dfae6054-83b7-4095-99dc-f497ef58044a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4847",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fa565fae6877093fe48ce8578cb2088ec800b11a\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913EDB:30C4D8D:5D9B9CDC"
-    }
-  },
-  "uuid": "dfae6054-83b7-4095-99dc-f497ef58044a",
-  "persistent": true,
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19.json
new file mode 100644
index 0000000000..849cfdb96e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_source-repositoryhtml-19.json
@@ -0,0 +1,48 @@
+{
+  "id": "dfae6054-83b7-4095-99dc-f497ef58044a",
+  "name": "repos_github-api_github-api_contents_source-repositoryhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/source-repository.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_source-repositoryhtml-19.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4847",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fa565fae6877093fe48ce8578cb2088ec800b11a\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913EDB:30C4D8D:5D9B9CDC"
+    }
+  },
+  "uuid": "dfae6054-83b7-4095-99dc-f497ef58044a",
+  "persistent": true,
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20-692982.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20-692982.json
deleted file mode 100644
index 1498321dc8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20-692982.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "69298281-9045-4dd4-8934-ac0a43157ef7",
-  "name": "repos_github-api_github-api_contents_team-listhtml",
-  "request": {
-    "url": "/repos/github-api/github-api/contents/team-list.html?ref=gh-pages",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_contents_team-listhtml-69298281-9045-4dd4-8934-ac0a43157ef7.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4846",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"809072ff21244980b44a93c5dcf8ed11063b4cc5\"",
-      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913EF2:30C4DAE:5D9B9CDC"
-    }
-  },
-  "uuid": "69298281-9045-4dd4-8934-ac0a43157ef7",
-  "persistent": true,
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20.json
new file mode 100644
index 0000000000..13b4eb33ef
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/repos_github-api_github-api_contents_team-listhtml-20.json
@@ -0,0 +1,48 @@
+{
+  "id": "69298281-9045-4dd4-8934-ac0a43157ef7",
+  "name": "repos_github-api_github-api_contents_team-listhtml",
+  "request": {
+    "url": "/repos/github-api/github-api/contents/team-list.html?ref=gh-pages",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_contents_team-listhtml-20.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4846",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"809072ff21244980b44a93c5dcf8ed11063b4cc5\"",
+      "Last-Modified": "Wed, 07 Nov 2018 15:49:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913EF2:30C4DAE:5D9B9CDC"
+    }
+  },
+  "uuid": "69298281-9045-4dd4-8934-ac0a43157ef7",
+  "persistent": true,
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1-656249.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1-656249.json
deleted file mode 100644
index 024821c874..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1-656249.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "656249de-1113-417e-8ea0-ce0930482f4a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-656249de-1113-417e-8ea0-ce0930482f4a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:15:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4866",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E93A:3C9F:2913D6F:30C4BD0:5D9B9CD8"
-    }
-  },
-  "uuid": "656249de-1113-417e-8ea0-ce0930482f4a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1.json
new file mode 100644
index 0000000000..006a4e3c33
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "656249de-1113-417e-8ea0-ce0930482f4a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:15:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4866",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E93A:3C9F:2913D6F:30C4BD0:5D9B9CD8"
+    }
+  },
+  "uuid": "656249de-1113-417e-8ea0-ce0930482f4a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependencieshtml-d0c5eb23-a516-43ab-9a51-230d66d21e90.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependencieshtml-2.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependencieshtml-d0c5eb23-a516-43ab-9a51-230d66d21e90.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependencieshtml-2.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-convergencehtml-9eeed313-39aa-4d0e-b7c9-e26acab9698f.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-convergencehtml-3.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-convergencehtml-9eeed313-39aa-4d0e-b7c9-e26acab9698f.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-convergencehtml-3.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-infohtml-3ca71855-6e2d-44d8-9cf9-47cbb2572252.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-infohtml-4.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-infohtml-3ca71855-6e2d-44d8-9cf9-47cbb2572252.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_dependency-infohtml-4.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_distribution-managementhtml-445a75a1-4463-4003-965e-2d1ffbbd4d60.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_distribution-managementhtml-5.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_distribution-managementhtml-445a75a1-4463-4003-965e-2d1ffbbd4d60.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_distribution-managementhtml-5.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_indexhtml-46228325-12ac-442f-86ee-e5e211cf79cb.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_indexhtml-6.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_indexhtml-46228325-12ac-442f-86ee-e5e211cf79cb.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_indexhtml-6.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_integrationhtml-92a89976-9e4e-46bb-aa19-b32445a2ed9e.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_integrationhtml-7.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_integrationhtml-92a89976-9e4e-46bb-aa19-b32445a2ed9e.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_integrationhtml-7.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_issue-trackinghtml-77d917fb-69d9-466a-99f6-3bfbf92998fd.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_issue-trackinghtml-8.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_issue-trackinghtml-77d917fb-69d9-466a-99f6-3bfbf92998fd.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_issue-trackinghtml-8.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_licensehtml-833a6540-79e4-4464-88e3-f87a5858230e.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_licensehtml-9.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_licensehtml-833a6540-79e4-4464-88e3-f87a5858230e.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_licensehtml-9.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_mail-listshtml-497d362b-54ca-4c9d-ac96-78f14da94df6.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_mail-listshtml-10.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_mail-listshtml-497d362b-54ca-4c9d-ac96-78f14da94df6.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_mail-listshtml-10.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_plugin-managementhtml-ee14513c-3bfb-4d8a-93f5-a9d188d7aa01.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_plugin-managementhtml-11.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_plugin-managementhtml-ee14513c-3bfb-4d8a-93f5-a9d188d7aa01.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_plugin-managementhtml-11.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_pluginshtml-80c8a143-a83b-45c8-881e-595f14aa1546.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_pluginshtml-12.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_pluginshtml-80c8a143-a83b-45c8-881e-595f14aa1546.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_pluginshtml-12.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-infohtml-c17c46c7-df79-4adf-b165-b8c801c896b6.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-infohtml-13.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-infohtml-c17c46c7-df79-4adf-b165-b8c801c896b6.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-infohtml-13.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-reportshtml-5367f0f5-0668-4a94-97d8-d6774aa02bdb.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-reportshtml-14.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-reportshtml-5367f0f5-0668-4a94-97d8-d6774aa02bdb.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-reportshtml-14.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-summaryhtml-60482688-7e2b-4475-ac2a-4f4c3ade718a.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-summaryhtml-15.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-summaryhtml-60482688-7e2b-4475-ac2a-4f4c3ade718a.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_project-summaryhtml-15.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_source-repositoryhtml-1548ed66-30fe-4ee5-8fba-e7de0b95df05.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_source-repositoryhtml-16.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_source-repositoryhtml-1548ed66-30fe-4ee5-8fba-e7de0b95df05.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_source-repositoryhtml-16.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_team-listhtml-15e8417b-48a3-4a71-b239-51b987d7b006.txt b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_team-listhtml-17.txt
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_team-listhtml-15e8417b-48a3-4a71-b239-51b987d7b006.txt
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/__files/github-api_github-api_gh-pages_team-listhtml-17.txt
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_cname-1-b36b55.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_cname-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_cname-1-b36b55.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_cname-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2-d0c5eb.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2-d0c5eb.json
deleted file mode 100644
index e4891851e6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2-d0c5eb.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "d0c5eb23-a516-43ab-9a51-230d66d21e90",
-  "name": "github-api_github-api_gh-pages_dependencieshtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/dependencies.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_dependencieshtml-d0c5eb23-a516-43ab-9a51-230d66d21e90.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"5c870e1a8f7e21eb8d386e3cfc146b5718a6020a\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "B49E:95E5:D1042:105458:5D9B9BBD",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479322.974796,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "bf1e3f5e50fa88b4d99f2052bf18ca6b1d6e9b47",
-      "Expires": "Mon, 07 Oct 2019 20:20:21 GMT",
-      "Source-Age": "284"
-    }
-  },
-  "uuid": "d0c5eb23-a516-43ab-9a51-230d66d21e90",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2.json
new file mode 100644
index 0000000000..af94e9b462
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependencieshtml-2.json
@@ -0,0 +1,45 @@
+{
+  "id": "d0c5eb23-a516-43ab-9a51-230d66d21e90",
+  "name": "github-api_github-api_gh-pages_dependencieshtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/dependencies.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_dependencieshtml-2.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"5c870e1a8f7e21eb8d386e3cfc146b5718a6020a\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "B49E:95E5:D1042:105458:5D9B9BBD",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:21 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479322.974796,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "bf1e3f5e50fa88b4d99f2052bf18ca6b1d6e9b47",
+      "Expires": "Mon, 07 Oct 2019 20:20:21 GMT",
+      "Source-Age": "284"
+    }
+  },
+  "uuid": "d0c5eb23-a516-43ab-9a51-230d66d21e90",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3-9eeed3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3-9eeed3.json
deleted file mode 100644
index c9f6cc708c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3-9eeed3.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "9eeed313-39aa-4d0e-b7c9-e26acab9698f",
-  "name": "github-api_github-api_gh-pages_dependency-convergencehtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/dependency-convergence.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_dependency-convergencehtml-9eeed313-39aa-4d0e-b7c9-e26acab9698f.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"5c2a3be517645c95003e1005ea62ffd23a039996\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "3EB6:6BCB:AF513:DE3C8:5D9B9BBE",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479322.240237,VS0,VE0",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "a3542e67180e532e1aff8aeb2c8df6bfc59c4e2d",
-      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
-      "Source-Age": "284"
-    }
-  },
-  "uuid": "9eeed313-39aa-4d0e-b7c9-e26acab9698f",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3.json
new file mode 100644
index 0000000000..a6130a9aa8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-convergencehtml-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "9eeed313-39aa-4d0e-b7c9-e26acab9698f",
+  "name": "github-api_github-api_gh-pages_dependency-convergencehtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/dependency-convergence.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_dependency-convergencehtml-3.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"5c2a3be517645c95003e1005ea62ffd23a039996\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "3EB6:6BCB:AF513:DE3C8:5D9B9BBE",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479322.240237,VS0,VE0",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "a3542e67180e532e1aff8aeb2c8df6bfc59c4e2d",
+      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
+      "Source-Age": "284"
+    }
+  },
+  "uuid": "9eeed313-39aa-4d0e-b7c9-e26acab9698f",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4-3ca718.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4-3ca718.json
deleted file mode 100644
index d2ceba163a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4-3ca718.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "3ca71855-6e2d-44d8-9cf9-47cbb2572252",
-  "name": "github-api_github-api_gh-pages_dependency-infohtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/dependency-info.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_dependency-infohtml-3ca71855-6e2d-44d8-9cf9-47cbb2572252.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"29e0151565943e6cfa05193b19c0de251b82dad6\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "F662:36C0:5A2B85:6A59C0:5D9B9BBE",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479322.437534,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "eba3ca837f7e2e2ef796682aff861522cd504d9d",
-      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
-      "Source-Age": "284"
-    }
-  },
-  "uuid": "3ca71855-6e2d-44d8-9cf9-47cbb2572252",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4.json
new file mode 100644
index 0000000000..9d3fb071f3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_dependency-infohtml-4.json
@@ -0,0 +1,45 @@
+{
+  "id": "3ca71855-6e2d-44d8-9cf9-47cbb2572252",
+  "name": "github-api_github-api_gh-pages_dependency-infohtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/dependency-info.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_dependency-infohtml-4.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"29e0151565943e6cfa05193b19c0de251b82dad6\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "F662:36C0:5A2B85:6A59C0:5D9B9BBE",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479322.437534,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "eba3ca837f7e2e2ef796682aff861522cd504d9d",
+      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
+      "Source-Age": "284"
+    }
+  },
+  "uuid": "3ca71855-6e2d-44d8-9cf9-47cbb2572252",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5-445a75.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5-445a75.json
deleted file mode 100644
index 4a52bd4c04..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5-445a75.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "445a75a1-4463-4003-965e-2d1ffbbd4d60",
-  "name": "github-api_github-api_gh-pages_distribution-managementhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/distribution-management.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_distribution-managementhtml-445a75a1-4463-4003-965e-2d1ffbbd4d60.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"012177489e014fb0b26f4871bf7d9df48c2d76e4\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "DA88:6887:8BBFF4:A461BD:5D9B9BBD",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479323.624157,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "0fb3f8c9d75ae5ee7bbc3e6f352252127c4b12f1",
-      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
-      "Source-Age": "284"
-    }
-  },
-  "uuid": "445a75a1-4463-4003-965e-2d1ffbbd4d60",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5.json
new file mode 100644
index 0000000000..c501f3beb7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_distribution-managementhtml-5.json
@@ -0,0 +1,45 @@
+{
+  "id": "445a75a1-4463-4003-965e-2d1ffbbd4d60",
+  "name": "github-api_github-api_gh-pages_distribution-managementhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/distribution-management.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_distribution-managementhtml-5.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"012177489e014fb0b26f4871bf7d9df48c2d76e4\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "DA88:6887:8BBFF4:A461BD:5D9B9BBD",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479323.624157,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "0fb3f8c9d75ae5ee7bbc3e6f352252127c4b12f1",
+      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
+      "Source-Age": "284"
+    }
+  },
+  "uuid": "445a75a1-4463-4003-965e-2d1ffbbd4d60",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6-462283.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6-462283.json
deleted file mode 100644
index 8ad74cf23d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6-462283.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "46228325-12ac-442f-86ee-e5e211cf79cb",
-  "name": "github-api_github-api_gh-pages_indexhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/index.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_indexhtml-46228325-12ac-442f-86ee-e5e211cf79cb.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"515047a8cb309d64be194a0ace36cf4c52e26ebc\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "17F0:6885:645398:76965E:5D9B9BBE",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479323.798245,VS0,VE0",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "01306febbf9e661a5742bc3da294ec7bccc38e0d",
-      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
-      "Source-Age": "283"
-    }
-  },
-  "uuid": "46228325-12ac-442f-86ee-e5e211cf79cb",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6.json
new file mode 100644
index 0000000000..ebea6891f0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_indexhtml-6.json
@@ -0,0 +1,45 @@
+{
+  "id": "46228325-12ac-442f-86ee-e5e211cf79cb",
+  "name": "github-api_github-api_gh-pages_indexhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/index.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_indexhtml-6.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"515047a8cb309d64be194a0ace36cf4c52e26ebc\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "17F0:6885:645398:76965E:5D9B9BBE",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479323.798245,VS0,VE0",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "01306febbf9e661a5742bc3da294ec7bccc38e0d",
+      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
+      "Source-Age": "283"
+    }
+  },
+  "uuid": "46228325-12ac-442f-86ee-e5e211cf79cb",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7-92a899.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7-92a899.json
deleted file mode 100644
index 12f62c8194..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7-92a899.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "92a89976-9e4e-46bb-aa19-b32445a2ed9e",
-  "name": "github-api_github-api_gh-pages_integrationhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/integration.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_integrationhtml-92a89976-9e4e-46bb-aa19-b32445a2ed9e.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"c2f94c57aed2bf09413d68f1265a79534fd95d5c\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "56FC:36C2:88DB65:A1293E:5D9B9BBF",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479323.974204,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "10c7fdd42a04c6a1b9b3227aa74ef448d7d85230",
-      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
-      "Source-Age": "283"
-    }
-  },
-  "uuid": "92a89976-9e4e-46bb-aa19-b32445a2ed9e",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7.json
new file mode 100644
index 0000000000..c48945e644
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_integrationhtml-7.json
@@ -0,0 +1,45 @@
+{
+  "id": "92a89976-9e4e-46bb-aa19-b32445a2ed9e",
+  "name": "github-api_github-api_gh-pages_integrationhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/integration.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_integrationhtml-7.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"c2f94c57aed2bf09413d68f1265a79534fd95d5c\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "56FC:36C2:88DB65:A1293E:5D9B9BBF",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:22 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479323.974204,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "10c7fdd42a04c6a1b9b3227aa74ef448d7d85230",
+      "Expires": "Mon, 07 Oct 2019 20:20:22 GMT",
+      "Source-Age": "283"
+    }
+  },
+  "uuid": "92a89976-9e4e-46bb-aa19-b32445a2ed9e",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8-77d917.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8-77d917.json
deleted file mode 100644
index 4b22a8be8f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8-77d917.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "77d917fb-69d9-466a-99f6-3bfbf92998fd",
-  "name": "github-api_github-api_gh-pages_issue-trackinghtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/issue-tracking.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_issue-trackinghtml-77d917fb-69d9-466a-99f6-3bfbf92998fd.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"ac832e2a65dc31d3ead0b5dd61365a044ad76c3f\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "1624:6BCE:962AB0:B08EA1:5D9B9BBF",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479323.157510,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "277bc7ddb7e80a6d9096eb932022a95d3e83d1b9",
-      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
-      "Source-Age": "283"
-    }
-  },
-  "uuid": "77d917fb-69d9-466a-99f6-3bfbf92998fd",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8.json
new file mode 100644
index 0000000000..76fea23e2b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_issue-trackinghtml-8.json
@@ -0,0 +1,45 @@
+{
+  "id": "77d917fb-69d9-466a-99f6-3bfbf92998fd",
+  "name": "github-api_github-api_gh-pages_issue-trackinghtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/issue-tracking.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_issue-trackinghtml-8.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"ac832e2a65dc31d3ead0b5dd61365a044ad76c3f\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "1624:6BCE:962AB0:B08EA1:5D9B9BBF",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479323.157510,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "277bc7ddb7e80a6d9096eb932022a95d3e83d1b9",
+      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
+      "Source-Age": "283"
+    }
+  },
+  "uuid": "77d917fb-69d9-466a-99f6-3bfbf92998fd",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9-833a65.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9-833a65.json
deleted file mode 100644
index ba0aea2c0d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9-833a65.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "833a6540-79e4-4464-88e3-f87a5858230e",
-  "name": "github-api_github-api_gh-pages_licensehtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/license.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_licensehtml-833a6540-79e4-4464-88e3-f87a5858230e.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"078dbdbf8e234664d36b831b1cbaa2787c3758af\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "4328:3D82:97A63F:B2D6E5:5D9B9BC0",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479323.302039,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "a9ffaca104413cda50364ed9bf746dd17e434901",
-      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
-      "Source-Age": "283"
-    }
-  },
-  "uuid": "833a6540-79e4-4464-88e3-f87a5858230e",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9.json
new file mode 100644
index 0000000000..8dfe16fa7b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_licensehtml-9.json
@@ -0,0 +1,45 @@
+{
+  "id": "833a6540-79e4-4464-88e3-f87a5858230e",
+  "name": "github-api_github-api_gh-pages_licensehtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/license.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_licensehtml-9.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"078dbdbf8e234664d36b831b1cbaa2787c3758af\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "4328:3D82:97A63F:B2D6E5:5D9B9BC0",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479323.302039,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "a9ffaca104413cda50364ed9bf746dd17e434901",
+      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
+      "Source-Age": "283"
+    }
+  },
+  "uuid": "833a6540-79e4-4464-88e3-f87a5858230e",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10-497d36.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10-497d36.json
deleted file mode 100644
index eab0072093..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10-497d36.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "497d362b-54ca-4c9d-ac96-78f14da94df6",
-  "name": "github-api_github-api_gh-pages_mail-listshtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/mail-lists.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_mail-listshtml-497d362b-54ca-4c9d-ac96-78f14da94df6.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"8de53775c5bb7e6a6b9be51efd6be918b44f6aed\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "17F0:6885:6453AC:769686:5D9B9BC0",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479324.676424,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "44954ef76da4cf0f1f01f71e2d1297c92cfb0051",
-      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
-      "Source-Age": "283"
-    }
-  },
-  "uuid": "497d362b-54ca-4c9d-ac96-78f14da94df6",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10.json
new file mode 100644
index 0000000000..3be5c52e90
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_mail-listshtml-10.json
@@ -0,0 +1,45 @@
+{
+  "id": "497d362b-54ca-4c9d-ac96-78f14da94df6",
+  "name": "github-api_github-api_gh-pages_mail-listshtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/mail-lists.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_mail-listshtml-10.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"8de53775c5bb7e6a6b9be51efd6be918b44f6aed\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "17F0:6885:6453AC:769686:5D9B9BC0",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479324.676424,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "44954ef76da4cf0f1f01f71e2d1297c92cfb0051",
+      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
+      "Source-Age": "283"
+    }
+  },
+  "uuid": "497d362b-54ca-4c9d-ac96-78f14da94df6",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11-ee1451.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11-ee1451.json
deleted file mode 100644
index c52e05b245..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11-ee1451.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "ee14513c-3bfb-4d8a-93f5-a9d188d7aa01",
-  "name": "github-api_github-api_gh-pages_plugin-managementhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/plugin-management.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_plugin-managementhtml-ee14513c-3bfb-4d8a-93f5-a9d188d7aa01.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"8222800d6ff2521f8cf1da476495a9ac9df18eda\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "6D58:36C0:5A2BC3:6A5A00:5D9B9BC1",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479324.868752,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "9713fc68f2d0c46c693eaf6c6db7cfe9a6e6a048",
-      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
-      "Source-Age": "282"
-    }
-  },
-  "uuid": "ee14513c-3bfb-4d8a-93f5-a9d188d7aa01",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11.json
new file mode 100644
index 0000000000..4d4c0f2a99
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_plugin-managementhtml-11.json
@@ -0,0 +1,45 @@
+{
+  "id": "ee14513c-3bfb-4d8a-93f5-a9d188d7aa01",
+  "name": "github-api_github-api_gh-pages_plugin-managementhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/plugin-management.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_plugin-managementhtml-11.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"8222800d6ff2521f8cf1da476495a9ac9df18eda\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "6D58:36C0:5A2BC3:6A5A00:5D9B9BC1",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:23 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479324.868752,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "9713fc68f2d0c46c693eaf6c6db7cfe9a6e6a048",
+      "Expires": "Mon, 07 Oct 2019 20:20:23 GMT",
+      "Source-Age": "282"
+    }
+  },
+  "uuid": "ee14513c-3bfb-4d8a-93f5-a9d188d7aa01",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12-80c8a1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12-80c8a1.json
deleted file mode 100644
index a7d52d1f9a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12-80c8a1.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "80c8a143-a83b-45c8-881e-595f14aa1546",
-  "name": "github-api_github-api_gh-pages_pluginshtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/plugins.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_pluginshtml-80c8a143-a83b-45c8-881e-595f14aa1546.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"36f588bf0319c029d9f0702a53888f3c8550d405\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "E1C2:6887:8BC018:A461E0:5D9B9BC0",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "4",
-      "X-Timer": "S1570479324.046815,VS0,VE0",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "6aa459923e33d663c2b3708ab99c47842bb7674f",
-      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
-      "Source-Age": "282"
-    }
-  },
-  "uuid": "80c8a143-a83b-45c8-881e-595f14aa1546",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12.json
new file mode 100644
index 0000000000..4a4d2525ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_pluginshtml-12.json
@@ -0,0 +1,45 @@
+{
+  "id": "80c8a143-a83b-45c8-881e-595f14aa1546",
+  "name": "github-api_github-api_gh-pages_pluginshtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/plugins.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_pluginshtml-12.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"36f588bf0319c029d9f0702a53888f3c8550d405\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "E1C2:6887:8BC018:A461E0:5D9B9BC0",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "4",
+      "X-Timer": "S1570479324.046815,VS0,VE0",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "6aa459923e33d663c2b3708ab99c47842bb7674f",
+      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
+      "Source-Age": "282"
+    }
+  },
+  "uuid": "80c8a143-a83b-45c8-881e-595f14aa1546",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13-c17c46.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13-c17c46.json
deleted file mode 100644
index 59b988bcf5..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13-c17c46.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "c17c46c7-df79-4adf-b165-b8c801c896b6",
-  "name": "github-api_github-api_gh-pages_project-infohtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/project-info.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_project-infohtml-c17c46c7-df79-4adf-b165-b8c801c896b6.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"390c7a4d52f8a77158486c330bf0a1fce704c5f3\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "473C:36C2:88DB83:A12961:5D9B9BC2",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479324.219080,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "f0c92587114f81b6d280c827c003c98b21fec934",
-      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
-      "Source-Age": "282"
-    }
-  },
-  "uuid": "c17c46c7-df79-4adf-b165-b8c801c896b6",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13.json
new file mode 100644
index 0000000000..04c8fc7854
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-infohtml-13.json
@@ -0,0 +1,45 @@
+{
+  "id": "c17c46c7-df79-4adf-b165-b8c801c896b6",
+  "name": "github-api_github-api_gh-pages_project-infohtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/project-info.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_project-infohtml-13.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"390c7a4d52f8a77158486c330bf0a1fce704c5f3\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "473C:36C2:88DB83:A12961:5D9B9BC2",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479324.219080,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "f0c92587114f81b6d280c827c003c98b21fec934",
+      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
+      "Source-Age": "282"
+    }
+  },
+  "uuid": "c17c46c7-df79-4adf-b165-b8c801c896b6",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14-5367f0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14-5367f0.json
deleted file mode 100644
index 4fa470e80f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14-5367f0.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "5367f0f5-0668-4a94-97d8-d6774aa02bdb",
-  "name": "github-api_github-api_gh-pages_project-reportshtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/project-reports.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_project-reportshtml-5367f0f5-0668-4a94-97d8-d6774aa02bdb.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"0f860eb86978834a817c60f315bbecaf0ebb3ee1\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "FF24:6BCE:962AFD:B08EEE:5D9B9BC2",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479324.408267,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "76d1f0a5d920472aef377904e298dc9b02defe9b",
-      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
-      "Source-Age": "282"
-    }
-  },
-  "uuid": "5367f0f5-0668-4a94-97d8-d6774aa02bdb",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14.json
new file mode 100644
index 0000000000..707c56b3eb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-reportshtml-14.json
@@ -0,0 +1,45 @@
+{
+  "id": "5367f0f5-0668-4a94-97d8-d6774aa02bdb",
+  "name": "github-api_github-api_gh-pages_project-reportshtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/project-reports.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_project-reportshtml-14.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"0f860eb86978834a817c60f315bbecaf0ebb3ee1\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "FF24:6BCE:962AFD:B08EEE:5D9B9BC2",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479324.408267,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "76d1f0a5d920472aef377904e298dc9b02defe9b",
+      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
+      "Source-Age": "282"
+    }
+  },
+  "uuid": "5367f0f5-0668-4a94-97d8-d6774aa02bdb",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15-604826.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15-604826.json
deleted file mode 100644
index e665cfc3cf..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15-604826.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "60482688-7e2b-4475-ac2a-4f4c3ade718a",
-  "name": "github-api_github-api_gh-pages_project-summaryhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/project-summary.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_project-summaryhtml-60482688-7e2b-4475-ac2a-4f4c3ade718a.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"4523d59f34d5f9581bb2ec50cd36a1e48e0fe6fd\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "17F0:6885:6453D6:7696B6:5D9B9BC2",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479325.580259,VS0,VE0",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "657d855e76a3fcfa26b349070197f47ba77a1502",
-      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
-      "Source-Age": "282"
-    }
-  },
-  "uuid": "60482688-7e2b-4475-ac2a-4f4c3ade718a",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15.json
new file mode 100644
index 0000000000..cb28541f96
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_project-summaryhtml-15.json
@@ -0,0 +1,45 @@
+{
+  "id": "60482688-7e2b-4475-ac2a-4f4c3ade718a",
+  "name": "github-api_github-api_gh-pages_project-summaryhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/project-summary.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_project-summaryhtml-15.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"4523d59f34d5f9581bb2ec50cd36a1e48e0fe6fd\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "17F0:6885:6453D6:7696B6:5D9B9BC2",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479325.580259,VS0,VE0",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "657d855e76a3fcfa26b349070197f47ba77a1502",
+      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
+      "Source-Age": "282"
+    }
+  },
+  "uuid": "60482688-7e2b-4475-ac2a-4f4c3ade718a",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16-1548ed.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16-1548ed.json
deleted file mode 100644
index f1668c31b0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16-1548ed.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "1548ed66-30fe-4ee5-8fba-e7de0b95df05",
-  "name": "github-api_github-api_gh-pages_source-repositoryhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/source-repository.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_source-repositoryhtml-1548ed66-30fe-4ee5-8fba-e7de0b95df05.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"fa565fae6877093fe48ce8578cb2088ec800b11a\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "BF7E:7969:8F6635:A8B7FA:5D9B9BC2",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479325.750071,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "c8c88cd1a9426100c45cf64418f11de29dc8b4bb",
-      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
-      "Source-Age": "281"
-    }
-  },
-  "uuid": "1548ed66-30fe-4ee5-8fba-e7de0b95df05",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16.json
new file mode 100644
index 0000000000..aba1fff86a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_source-repositoryhtml-16.json
@@ -0,0 +1,45 @@
+{
+  "id": "1548ed66-30fe-4ee5-8fba-e7de0b95df05",
+  "name": "github-api_github-api_gh-pages_source-repositoryhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/source-repository.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_source-repositoryhtml-16.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"fa565fae6877093fe48ce8578cb2088ec800b11a\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "BF7E:7969:8F6635:A8B7FA:5D9B9BC2",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479325.750071,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "c8c88cd1a9426100c45cf64418f11de29dc8b4bb",
+      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
+      "Source-Age": "281"
+    }
+  },
+  "uuid": "1548ed66-30fe-4ee5-8fba-e7de0b95df05",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17-15e841.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17-15e841.json
deleted file mode 100644
index 80c7356bfc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17-15e841.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "15e8417b-48a3-4a71-b239-51b987d7b006",
-  "name": "github-api_github-api_gh-pages_team-listhtml",
-  "request": {
-    "url": "/github-api/github-api/gh-pages/team-list.html",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "github-api_github-api_gh-pages_team-listhtml-15e8417b-48a3-4a71-b239-51b987d7b006.txt",
-    "headers": {
-      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
-      "Strict-Transport-Security": "max-age=31536000",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-XSS-Protection": "1; mode=block",
-      "ETag": "\"809072ff21244980b44a93c5dcf8ed11063b4cc5\"",
-      "Content-Type": "text/plain; charset=utf-8",
-      "Cache-Control": "max-age=300",
-      "X-Geo-Block-List": "",
-      "X-GitHub-Request-Id": "241C:7969:8F663A:A8B805:5D9B9BC3",
-      "Accept-Ranges": "bytes",
-      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
-      "Via": "1.1 varnish",
-      "Connection": "keep-alive",
-      "X-Served-By": "cache-sea1051-SEA",
-      "X-Cache": "HIT",
-      "X-Cache-Hits": "1",
-      "X-Timer": "S1570479325.928665,VS0,VE1",
-      "Vary": "Authorization,Accept-Encoding",
-      "Access-Control-Allow-Origin": "*",
-      "X-Fastly-Request-ID": "9761935be1dd67220ae54f816136b2cbf9ba45c9",
-      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
-      "Source-Age": "281"
-    }
-  },
-  "uuid": "15e8417b-48a3-4a71-b239-51b987d7b006",
-  "persistent": true,
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17.json
new file mode 100644
index 0000000000..89dad5c64b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testIssue162_raw/mappings/github-api_github-api_gh-pages_team-listhtml-17.json
@@ -0,0 +1,45 @@
+{
+  "id": "15e8417b-48a3-4a71-b239-51b987d7b006",
+  "name": "github-api_github-api_gh-pages_team-listhtml",
+  "request": {
+    "url": "/github-api/github-api/gh-pages/team-list.html",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "github-api_github-api_gh-pages_team-listhtml-17.txt",
+    "headers": {
+      "Content-Security-Policy": "default-src 'none'; style-src 'unsafe-inline'; sandbox",
+      "Strict-Transport-Security": "max-age=31536000",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-XSS-Protection": "1; mode=block",
+      "ETag": "\"809072ff21244980b44a93c5dcf8ed11063b4cc5\"",
+      "Content-Type": "text/plain; charset=utf-8",
+      "Cache-Control": "max-age=300",
+      "X-Geo-Block-List": "",
+      "X-GitHub-Request-Id": "241C:7969:8F663A:A8B805:5D9B9BC3",
+      "Accept-Ranges": "bytes",
+      "Date": "Mon, 07 Oct 2019 20:15:24 GMT",
+      "Via": "1.1 varnish",
+      "Connection": "keep-alive",
+      "X-Served-By": "cache-sea1051-SEA",
+      "X-Cache": "HIT",
+      "X-Cache-Hits": "1",
+      "X-Timer": "S1570479325.928665,VS0,VE1",
+      "Vary": "Authorization,Accept-Encoding",
+      "Access-Control-Allow-Origin": "*",
+      "X-Fastly-Request-ID": "9761935be1dd67220ae54f816136b2cbf9ba45c9",
+      "Expires": "Mon, 07 Oct 2019 20:20:24 GMT",
+      "Source-Age": "281"
+    }
+  },
+  "uuid": "15e8417b-48a3-4a71-b239-51b987d7b006",
+  "persistent": true,
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-1c10db5e-a753-4136-813b-1a69b5bccc8e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-1c10db5e-a753-4136-813b-1a69b5bccc8e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-a50794a3-d76a-4627-bbe3-f4ed30375298.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-a50794a3-d76a-4627-bbe3-f4ed30375298.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-5f1779e8-fd79-4b15-af0c-db5a92b11aa3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-5f1779e8-fd79-4b15-af0c-db5a92b11aa3.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-7452138f-8195-48d1-92e3-ebb73d152750.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-7452138f-8195-48d1-92e3-ebb73d152750.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/repos_bitwiseman_test-repo-public-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user-e09de733-d3c9-4a4d-89ab-8180ace9484c.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user-e09de733-d3c9-4a4d-89ab-8180ace9484c.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user_repos-d25ff0c0-0d91-461c-a42d-74926a2b751e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user_repos-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user_repos-d25ff0c0-0d91-461c-a42d-74926a2b751e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/__files/user_repos-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3-1c10db.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3-1c10db.json
deleted file mode 100644
index b5b85e16cd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3-1c10db.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "1c10db5e-a753-4136-813b-1a69b5bccc8e",
-  "name": "repos_bitwiseman_test-repo-public",
-  "request": {
-    "url": "/repos/bitwiseman/test-repo-public",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"private\":\"true\",\"name\":\"test-repo-public\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_test-repo-public-1c10db5e-a753-4136-813b-1a69b5bccc8e.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:38:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4965",
-      "X-RateLimit-Reset": "1570141865",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"78754c2eb03f415f84db8db038bd4f01\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC25:9578:F642D1:126B144:5D966A42"
-    }
-  },
-  "uuid": "1c10db5e-a753-4136-813b-1a69b5bccc8e",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3.json
new file mode 100644
index 0000000000..6a70f45c76
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-3.json
@@ -0,0 +1,54 @@
+{
+  "id": "1c10db5e-a753-4136-813b-1a69b5bccc8e",
+  "name": "repos_bitwiseman_test-repo-public",
+  "request": {
+    "url": "/repos/bitwiseman/test-repo-public",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":\"true\",\"name\":\"test-repo-public\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_test-repo-public-3.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:38:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4965",
+      "X-RateLimit-Reset": "1570141865",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"78754c2eb03f415f84db8db038bd4f01\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC25:9578:F642D1:126B144:5D966A42"
+    }
+  },
+  "uuid": "1c10db5e-a753-4136-813b-1a69b5bccc8e",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4-a50794.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4-a50794.json
deleted file mode 100644
index 940a656e07..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4-a50794.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "a50794a3-d76a-4627-bbe3-f4ed30375298",
-  "name": "repos_bitwiseman_test-repo-public",
-  "request": {
-    "url": "/repos/bitwiseman/test-repo-public",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_test-repo-public-a50794a3-d76a-4627-bbe3-f4ed30375298.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:38:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1570141865",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"78754c2eb03f415f84db8db038bd4f01\"",
-      "Last-Modified": "Thu, 03 Oct 2019 21:38:10 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC25:9578:F642FC:126B175:5D966A42"
-    }
-  },
-  "uuid": "a50794a3-d76a-4627-bbe3-f4ed30375298",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-bitwiseman-test-repo-public",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-bitwiseman-test-repo-public-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4.json
new file mode 100644
index 0000000000..38b1a5759a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-4.json
@@ -0,0 +1,51 @@
+{
+  "id": "a50794a3-d76a-4627-bbe3-f4ed30375298",
+  "name": "repos_bitwiseman_test-repo-public",
+  "request": {
+    "url": "/repos/bitwiseman/test-repo-public",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_test-repo-public-4.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:38:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1570141865",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"78754c2eb03f415f84db8db038bd4f01\"",
+      "Last-Modified": "Thu, 03 Oct 2019 21:38:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC25:9578:F642FC:126B175:5D966A42"
+    }
+  },
+  "uuid": "a50794a3-d76a-4627-bbe3-f4ed30375298",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-bitwiseman-test-repo-public",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-bitwiseman-test-repo-public-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5-745213.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5-745213.json
deleted file mode 100644
index db1816b6a8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5-745213.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "7452138f-8195-48d1-92e3-ebb73d152750",
-  "name": "repos_bitwiseman_test-repo-public",
-  "request": {
-    "url": "/repos/bitwiseman/test-repo-public",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"private\":\"false\",\"name\":\"test-repo-public\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_test-repo-public-7452138f-8195-48d1-92e3-ebb73d152750.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:38:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4963",
-      "X-RateLimit-Reset": "1570141865",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1574570f6e3a86bf6ed556e44041f726\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC25:9578:F64316:126B19F:5D966A43"
-    }
-  },
-  "uuid": "7452138f-8195-48d1-92e3-ebb73d152750",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5.json
new file mode 100644
index 0000000000..710bb3798c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "7452138f-8195-48d1-92e3-ebb73d152750",
+  "name": "repos_bitwiseman_test-repo-public",
+  "request": {
+    "url": "/repos/bitwiseman/test-repo-public",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":\"false\",\"name\":\"test-repo-public\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_test-repo-public-5.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:38:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4963",
+      "X-RateLimit-Reset": "1570141865",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1574570f6e3a86bf6ed556e44041f726\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC25:9578:F64316:126B19F:5D966A43"
+    }
+  },
+  "uuid": "7452138f-8195-48d1-92e3-ebb73d152750",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6-5f1779.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6-5f1779.json
deleted file mode 100644
index 49f27f6b31..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6-5f1779.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "5f1779e8-fd79-4b15-af0c-db5a92b11aa3",
-  "name": "repos_bitwiseman_test-repo-public",
-  "request": {
-    "url": "/repos/bitwiseman/test-repo-public",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_bitwiseman_test-repo-public-5f1779e8-fd79-4b15-af0c-db5a92b11aa3.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:38:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1570141865",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1574570f6e3a86bf6ed556e44041f726\"",
-      "Last-Modified": "Thu, 03 Oct 2019 21:38:11 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC25:9578:F6433B:126B1C2:5D966A43"
-    }
-  },
-  "uuid": "5f1779e8-fd79-4b15-af0c-db5a92b11aa3",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-bitwiseman-test-repo-public",
-  "requiredScenarioState": "scenario-1-repos-bitwiseman-test-repo-public-2",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6.json
new file mode 100644
index 0000000000..9fe424c460
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-6.json
@@ -0,0 +1,50 @@
+{
+  "id": "5f1779e8-fd79-4b15-af0c-db5a92b11aa3",
+  "name": "repos_bitwiseman_test-repo-public",
+  "request": {
+    "url": "/repos/bitwiseman/test-repo-public",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_bitwiseman_test-repo-public-6.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:38:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1570141865",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1574570f6e3a86bf6ed556e44041f726\"",
+      "Last-Modified": "Thu, 03 Oct 2019 21:38:11 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC25:9578:F6433B:126B1C2:5D966A43"
+    }
+  },
+  "uuid": "5f1779e8-fd79-4b15-af0c-db5a92b11aa3",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-bitwiseman-test-repo-public",
+  "requiredScenarioState": "scenario-1-repos-bitwiseman-test-repo-public-2",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-7-f9f729.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-7-f9f729.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/repos_bitwiseman_test-repo-public-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1-e09de7.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1-e09de7.json
deleted file mode 100644
index 6ac2dd3a98..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1-e09de7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e09de733-d3c9-4a4d-89ab-8180ace9484c",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-e09de733-d3c9-4a4d-89ab-8180ace9484c.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:38:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1570141865",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC25:9578:F6423D:126B09E:5D966A41"
-    }
-  },
-  "uuid": "e09de733-d3c9-4a4d-89ab-8180ace9484c",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1.json
new file mode 100644
index 0000000000..b81591f8ee
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "e09de733-d3c9-4a4d-89ab-8180ace9484c",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:38:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1570141865",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC25:9578:F6423D:126B09E:5D966A41"
+    }
+  },
+  "uuid": "e09de733-d3c9-4a4d-89ab-8180ace9484c",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2-d25ff0.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2-d25ff0.json
deleted file mode 100644
index c3ab1e22cc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2-d25ff0.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "d25ff0c0-0d91-461c-a42d-74926a2b751e",
-  "name": "user_repos",
-  "request": {
-    "url": "/user/repos",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"private\":false,\"name\":\"test-repo-public\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "user_repos-d25ff0c0-0d91-461c-a42d-74926a2b751e.json",
-    "headers": {
-      "Date": "Thu, 03 Oct 2019 21:38:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "1570141865",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"b00ca0508b8afbd36220b55379963f57\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/bitwiseman/test-repo-public",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC25:9578:F64280:126B0AE:5D966A41"
-    }
-  },
-  "uuid": "d25ff0c0-0d91-461c-a42d-74926a2b751e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2.json
new file mode 100644
index 0000000000..b5749e0092
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetPublic/mappings/user_repos-2.json
@@ -0,0 +1,55 @@
+{
+  "id": "d25ff0c0-0d91-461c-a42d-74926a2b751e",
+  "name": "user_repos",
+  "request": {
+    "url": "/user/repos",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":false,\"name\":\"test-repo-public\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "user_repos-2.json",
+    "headers": {
+      "Date": "Thu, 03 Oct 2019 21:38:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "1570141865",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"b00ca0508b8afbd36220b55379963f57\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/bitwiseman/test-repo-public",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC25:9578:F64280:126B0AE:5D966A41"
+    }
+  },
+  "uuid": "d25ff0c0-0d91-461c-a42d-74926a2b751e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/orgs_github-api-test-org-0774979f-2840-46c6-ac31-ea9ebea16a15.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/orgs_github-api-test-org-0774979f-2840-46c6-ac31-ea9ebea16a15.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/repos_github-api-test-org_github-api-6396d3b5-36ad-4990-a691-55a3bca11280.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/repos_github-api-test-org_github-api-6396d3b5-36ad-4990-a691-55a3bca11280.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/user-489e213c-810a-407d-b9aa-f7b00cdc8995.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/user-489e213c-810a-407d-b9aa-f7b00cdc8995.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2-077497.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2-077497.json
deleted file mode 100644
index 69e9e9c68b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2-077497.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0774979f-2840-46c6-ac31-ea9ebea16a15",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-0774979f-2840-46c6-ac31-ea9ebea16a15.json",
-    "headers": {
-      "Date": "Thu, 07 Nov 2019 05:19:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4934",
-      "X-RateLimit-Reset": "1573107045",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE66:9B40:1DDF992:2298B7D:5DC3A95E"
-    }
-  },
-  "uuid": "0774979f-2840-46c6-ac31-ea9ebea16a15",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..68075e9982
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "0774979f-2840-46c6-ac31-ea9ebea16a15",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 07 Nov 2019 05:19:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1573107045",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bbee0a14a82ca84871298052e1bcb545\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE66:9B40:1DDF992:2298B7D:5DC3A95E"
+    }
+  },
+  "uuid": "0774979f-2840-46c6-ac31-ea9ebea16a15",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3-6396d3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3-6396d3.json
deleted file mode 100644
index 6cb70e5243..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3-6396d3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6396d3b5-36ad-4990-a691-55a3bca11280",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-6396d3b5-36ad-4990-a691-55a3bca11280.json",
-    "headers": {
-      "Date": "Thu, 07 Nov 2019 05:19:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1573107045",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7998c1d58ba95b2e4a1c263537718671\"",
-      "Last-Modified": "Thu, 07 Nov 2019 05:19:07 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE66:9B40:1DDF99E:2298BA4:5DC3A95F"
-    }
-  },
-  "uuid": "6396d3b5-36ad-4990-a691-55a3bca11280",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..dadcd91068
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6396d3b5-36ad-4990-a691-55a3bca11280",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 07 Nov 2019 05:19:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1573107045",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7998c1d58ba95b2e4a1c263537718671\"",
+      "Last-Modified": "Thu, 07 Nov 2019 05:19:07 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE66:9B40:1DDF99E:2298BA4:5DC3A95F"
+    }
+  },
+  "uuid": "6396d3b5-36ad-4990-a691-55a3bca11280",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-10-d74974.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-10-d74974.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-11-57a970.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-11-57a970.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-4-e6442e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-4-e6442e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-5-2dc36e.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-5-2dc36e.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-6-83a58f.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-6-83a58f.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-7-eed846.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-7-eed846.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-8-df3c07.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-8-df3c07.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-9-6159ab.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-9-6159ab.json
rename to src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/repos_github-api-test-org_github-api_topics-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1-489e21.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1-489e21.json
deleted file mode 100644
index 507f6136dd..0000000000
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1-489e21.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "489e213c-810a-407d-b9aa-f7b00cdc8995",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-489e213c-810a-407d-b9aa-f7b00cdc8995.json",
-    "headers": {
-      "Date": "Thu, 07 Nov 2019 05:19:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1573107045",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a789c1045b95bcbfa3f1d935ffbc801c\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE66:9B40:1DDF971:2298B77:5DC3A95E"
-    }
-  },
-  "uuid": "489e213c-810a-407d-b9aa-f7b00cdc8995",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1.json
new file mode 100644
index 0000000000..0f5f3d07d5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/testSetTopics/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "489e213c-810a-407d-b9aa-f7b00cdc8995",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 07 Nov 2019 05:19:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1573107045",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a789c1045b95bcbfa3f1d935ffbc801c\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE66:9B40:1DDF971:2298B77:5DC3A95E"
+    }
+  },
+  "uuid": "489e213c-810a-407d-b9aa-f7b00cdc8995",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/orgs_github-api-test-org-d542cf64-ac9f-4fe7-bc38-9286b63c7828.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/orgs_github-api-test-org-d542cf64-ac9f-4fe7-bc38-9286b63c7828.json
rename to src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api-18a0b001-eca8-40df-bafa-9c767c9e209a.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api-18a0b001-eca8-40df-bafa-9c767c9e209a.json
rename to src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_refs-f654b3ef-74dc-4775-8809-f07c2a44925e.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_refs-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_refs-f654b3ef-74dc-4775-8809-f07c2a44925e.json
rename to src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_refs-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_tags-4af1f264-7a36-4de9-bda9-a3ded9171589.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_tags-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_tags-4af1f264-7a36-4de9-bda9-a3ded9171589.json
rename to src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/repos_github-api-test-org_github-api_git_tags-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/user-a8d3e54a-c069-4f34-9f86-e811649e0ce1.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/user-a8d3e54a-c069-4f34-9f86-e811649e0ce1.json
rename to src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2-d542cf.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2-d542cf.json
deleted file mode 100644
index ca55993f2d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2-d542cf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d542cf64-ac9f-4fe7-bc38-9286b63c7828",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-d542cf64-ac9f-4fe7-bc38-9286b63c7828.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 23:17:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4975",
-      "X-RateLimit-Reset": "1578701497",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"baa5a9df51598a7157caf0bf0f377482\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BB06:1AD3:68EF1F:799228:5E1905F6"
-    }
-  },
-  "uuid": "d542cf64-ac9f-4fe7-bc38-9286b63c7828",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..a26836e1af
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "d542cf64-ac9f-4fe7-bc38-9286b63c7828",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 23:17:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4975",
+      "X-RateLimit-Reset": "1578701497",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"baa5a9df51598a7157caf0bf0f377482\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BB06:1AD3:68EF1F:799228:5E1905F6"
+    }
+  },
+  "uuid": "d542cf64-ac9f-4fe7-bc38-9286b63c7828",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3-18a0b0.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3-18a0b0.json
deleted file mode 100644
index 79d017c584..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3-18a0b0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "18a0b001-eca8-40df-bafa-9c767c9e209a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-18a0b001-eca8-40df-bafa-9c767c9e209a.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 23:17:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1578701497",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"66f07f20b59c67d96b7aecf0ae184593\"",
-      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
-      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BB06:1AD3:68EF27:799263:5E1905F9"
-    }
-  },
-  "uuid": "18a0b001-eca8-40df-bafa-9c767c9e209a",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..21c450450d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "18a0b001-eca8-40df-bafa-9c767c9e209a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 23:17:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1578701497",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"66f07f20b59c67d96b7aecf0ae184593\"",
+      "Last-Modified": "Fri, 20 Dec 2019 00:07:51 GMT",
+      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BB06:1AD3:68EF27:799263:5E1905F9"
+    }
+  },
+  "uuid": "18a0b001-eca8-40df-bafa-9c767c9e209a",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5-f654b3.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5-f654b3.json
deleted file mode 100644
index 8a76e11a16..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5-f654b3.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "f654b3ef-74dc-4775-8809-f07c2a44925e",
-  "name": "repos_github-api-test-org_github-api_git_refs",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/refs",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"ref\":\"refs/tags/create_tag_test\",\"sha\":\"e7aa6d4afbaa48669f0bbe11ca3c4d787b2b153c\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-f654b3ef-74dc-4775-8809-f07c2a44925e.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 23:17:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1578701497",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"c369f800ca461fa9cff882ed5e49b2b2\"",
-      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/tags/create_tag_test",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BB06:1AD3:68EF3B:79927A:5E1905FA"
-    }
-  },
-  "uuid": "f654b3ef-74dc-4775-8809-f07c2a44925e",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5.json
new file mode 100644
index 0000000000..a0ab4cdb51
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_refs-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "f654b3ef-74dc-4775-8809-f07c2a44925e",
+  "name": "repos_github-api-test-org_github-api_git_refs",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/refs",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"ref\":\"refs/tags/create_tag_test\",\"sha\":\"e7aa6d4afbaa48669f0bbe11ca3c4d787b2b153c\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-5.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 23:17:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1578701497",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"c369f800ca461fa9cff882ed5e49b2b2\"",
+      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/tags/create_tag_test",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BB06:1AD3:68EF3B:79927A:5E1905FA"
+    }
+  },
+  "uuid": "f654b3ef-74dc-4775-8809-f07c2a44925e",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4-4af1f2.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4-4af1f2.json
deleted file mode 100644
index c220286f8c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4-4af1f2.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "4af1f264-7a36-4de9-bda9-a3ded9171589",
-  "name": "repos_github-api-test-org_github-api_git_tags",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/tags",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"tag\":\"create_tag_test\",\"message\":\"Test Tag\",\"type\":\"commit\",\"object\":\"dfe47235cfdcaa12292dab3b1a84ca53a1ceadaf\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_tags-4af1f264-7a36-4de9-bda9-a3ded9171589.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 23:17:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4973",
-      "X-RateLimit-Reset": "1578701497",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"e0a9bc5cd9f328b216fce3f06632746e\"",
-      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/tags/e7aa6d4afbaa48669f0bbe11ca3c4d787b2b153c",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BB06:1AD3:68EF30:79926C:5E1905F9"
-    }
-  },
-  "uuid": "4af1f264-7a36-4de9-bda9-a3ded9171589",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4.json
new file mode 100644
index 0000000000..e89127f3ca
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/repos_github-api-test-org_github-api_git_tags-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "4af1f264-7a36-4de9-bda9-a3ded9171589",
+  "name": "repos_github-api-test-org_github-api_git_tags",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/tags",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"tag\":\"create_tag_test\",\"message\":\"Test Tag\",\"type\":\"commit\",\"object\":\"dfe47235cfdcaa12292dab3b1a84ca53a1ceadaf\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_tags-4.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 23:17:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4973",
+      "X-RateLimit-Reset": "1578701497",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"e0a9bc5cd9f328b216fce3f06632746e\"",
+      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/tags/e7aa6d4afbaa48669f0bbe11ca3c4d787b2b153c",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BB06:1AD3:68EF30:79926C:5E1905F9"
+    }
+  },
+  "uuid": "4af1f264-7a36-4de9-bda9-a3ded9171589",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1-a8d3e5.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1-a8d3e5.json
deleted file mode 100644
index 4184bdc2c4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1-a8d3e5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a8d3e54a-c069-4f34-9f86-e811649e0ce1",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a8d3e54a-c069-4f34-9f86-e811649e0ce1.json",
-    "headers": {
-      "Date": "Fri, 10 Jan 2020 23:17:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "1578701497",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3b36eaa6ba7bc6b7076b29901d1a2e68\"",
-      "Last-Modified": "Thu, 09 Jan 2020 05:50:04 GMT",
-      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "BB06:1AD3:68EEE9:79921E:5E1905F5"
-    }
-  },
-  "uuid": "a8d3e54a-c069-4f34-9f86-e811649e0ce1",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1.json
new file mode 100644
index 0000000000..a0d26f3cca
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTagTest/wiremock/testCreateTag/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a8d3e54a-c069-4f34-9f86-e811649e0ce1",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 10 Jan 2020 23:17:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "1578701497",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3b36eaa6ba7bc6b7076b29901d1a2e68\"",
+      "Last-Modified": "Thu, 09 Jan 2020 05:50:04 GMT",
+      "X-OAuth-Scopes": "admin:org, delete_repo, gist, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "BB06:1AD3:68EEE9:79921E:5E1905F5"
+    }
+  },
+  "uuid": "a8d3e54a-c069-4f34-9f86-e811649e0ce1",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org-3211dfd0-5228-4cdc-aea3-ab67437f3fd4.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org-3211dfd0-5228-4cdc-aea3-ab67437f3fd4.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-b239719e-8610-449b-91bd-a35f4cc00424.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-b239719e-8610-449b-91bd-a35f4cc00424.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-32efe61a-4308-46c2-a349-010050ec8685.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-32efe61a-4308-46c2-a349-010050ec8685.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-32b16e2a-e453-4e91-9442-08073572a327.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-32b16e2a-e453-4e91-9442-08073572a327.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/orgs_github-api-test-org_teams_dummy-team-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-a8678668-24d0-4f75-b5a3-da720a764dd6.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-a8678668-24d0-4f75-b5a3-da720a764dd6.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-de9b6c26-1f63-4cc3-b4f6-6691f9bf180c.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-de9b6c26-1f63-4cc3-b4f6-6691f9bf180c.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/teams_3451996-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/user-fd7e486f-6713-462f-955f-7fcb8535064e.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/user-fd7e486f-6713-462f-955f-7fcb8535064e.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2-3211df.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2-3211df.json
deleted file mode 100644
index db34680fb3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2-3211df.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "3211dfd0-5228-4cdc-aea3-ab67437f3fd4",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-3211dfd0-5228-4cdc-aea3-ab67437f3fd4.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4445",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d4203e09aeffc9b5325c2a5355275b5\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A21:151ED4:5E709474"
-    }
-  },
-  "uuid": "3211dfd0-5228-4cdc-aea3-ab67437f3fd4",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..b2d2455266
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "3211dfd0-5228-4cdc-aea3-ab67437f3fd4",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4445",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d4203e09aeffc9b5325c2a5355275b5\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A21:151ED4:5E709474"
+    }
+  },
+  "uuid": "3211dfd0-5228-4cdc-aea3-ab67437f3fd4",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3-b23971.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3-b23971.json
deleted file mode 100644
index d4b420386b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3-b23971.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "b239719e-8610-449b-91bd-a35f4cc00424",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-b239719e-8610-449b-91bd-a35f4cc00424.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4444",
-      "X-RateLimit-Reset": "1584436622",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"a3be19ac98441e2833990a01948c5bbd\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:06:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A28:151EF6:5E709475"
-    }
-  },
-  "uuid": "b239719e-8610-449b-91bd-a35f4cc00424",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3.json
new file mode 100644
index 0000000000..7f8d8bad22
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "b239719e-8610-449b-91bd-a35f4cc00424",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-3.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4444",
+      "X-RateLimit-Reset": "1584436622",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"a3be19ac98441e2833990a01948c5bbd\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:06:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A28:151EF6:5E709475"
+    }
+  },
+  "uuid": "b239719e-8610-449b-91bd-a35f4cc00424",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5-32efe6.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5-32efe6.json
deleted file mode 100644
index f5805676a4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5-32efe6.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "32efe61a-4308-46c2-a349-010050ec8685",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-32efe61a-4308-46c2-a349-010050ec8685.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4442",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"75d86f6a186a1443ab68cf325a05da6a\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:12:22 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A3F:151F13:5E709476"
-    }
-  },
-  "uuid": "32efe61a-4308-46c2-a349-010050ec8685",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
-  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
-  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5.json
new file mode 100644
index 0000000000..c63bb5ba7c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-5.json
@@ -0,0 +1,49 @@
+{
+  "id": "32efe61a-4308-46c2-a349-010050ec8685",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-5.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4442",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"75d86f6a186a1443ab68cf325a05da6a\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:12:22 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A3F:151F13:5E709476"
+    }
+  },
+  "uuid": "32efe61a-4308-46c2-a349-010050ec8685",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
+  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
+  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7-32b16e.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7-32b16e.json
deleted file mode 100644
index da7330dcf4..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7-32b16e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "32b16e2a-e453-4e91-9442-08073572a327",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-32b16e2a-e453-4e91-9442-08073572a327.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4440",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"b8ddc7cdc32515a463c5e60f9f253dd1\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:12:23 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A4D:151F20:5E709477"
-    }
-  },
-  "uuid": "32b16e2a-e453-4e91-9442-08073572a327",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
-  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7.json
new file mode 100644
index 0000000000..f6ceafd90a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/orgs_github-api-test-org_teams_dummy-team-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "32b16e2a-e453-4e91-9442-08073572a327",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-7.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4440",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"b8ddc7cdc32515a463c5e60f9f253dd1\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:12:23 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A4D:151F20:5E709477"
+    }
+  },
+  "uuid": "32b16e2a-e453-4e91-9442-08073572a327",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
+  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4-a86786.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4-a86786.json
deleted file mode 100644
index d71783e3a3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4-a86786.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "a8678668-24d0-4f75-b5a3-da720a764dd6",
-  "name": "teams_3451996",
-  "request": {
-    "url": "/teams/3451996",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"Updated by API Test\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3451996-a8678668-24d0-4f75-b5a3-da720a764dd6.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4443",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"6d0f4cb5dd3a7f45b3267da728da2e09\"",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
-      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A32:151F01:5E709476",
-      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
-    }
-  },
-  "uuid": "a8678668-24d0-4f75-b5a3-da720a764dd6",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4.json
new file mode 100644
index 0000000000..f55bae64af
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "a8678668-24d0-4f75-b5a3-da720a764dd6",
+  "name": "teams_3451996",
+  "request": {
+    "url": "/teams/3451996",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"Updated by API Test\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3451996-4.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4443",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"6d0f4cb5dd3a7f45b3267da728da2e09\"",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
+      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A32:151F01:5E709476",
+      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
+    }
+  },
+  "uuid": "a8678668-24d0-4f75-b5a3-da720a764dd6",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6-de9b6c.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6-de9b6c.json
deleted file mode 100644
index 6cd3df1425..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6-de9b6c.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "de9b6c26-1f63-4cc3-b4f6-6691f9bf180c",
-  "name": "teams_3451996",
-  "request": {
-    "url": "/teams/3451996",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"Updated by API TestModified\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3451996-de9b6c26-1f63-4cc3-b4f6-6691f9bf180c.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4441",
-      "X-RateLimit-Reset": "1584436622",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"c406eaf9f146399b1f43691171336958\"",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
-      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A43:151F17:5E709476",
-      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
-    }
-  },
-  "uuid": "de9b6c26-1f63-4cc3-b4f6-6691f9bf180c",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6.json
new file mode 100644
index 0000000000..a658fa590b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/teams_3451996-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "de9b6c26-1f63-4cc3-b4f6-6691f9bf180c",
+  "name": "teams_3451996",
+  "request": {
+    "url": "/teams/3451996",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"Updated by API TestModified\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3451996-6.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4441",
+      "X-RateLimit-Reset": "1584436622",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"c406eaf9f146399b1f43691171336958\"",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
+      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A43:151F17:5E709476",
+      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
+    }
+  },
+  "uuid": "de9b6c26-1f63-4cc3-b4f6-6691f9bf180c",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1-fd7e48.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1-fd7e48.json
deleted file mode 100644
index 3d6c546c36..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1-fd7e48.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "fd7e486f-6713-462f-955f-7fcb8535064e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-fd7e486f-6713-462f-955f-7fcb8535064e.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4447",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
-      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8C7:46E1:A3A09:151ECC:5E709474"
-    }
-  },
-  "uuid": "fd7e486f-6713-462f-955f-7fcb8535064e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1.json
new file mode 100644
index 0000000000..329d2cb68c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetDescription/mappings/user-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "fd7e486f-6713-462f-955f-7fcb8535064e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4447",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
+      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8C7:46E1:A3A09:151ECC:5E709474"
+    }
+  },
+  "uuid": "fd7e486f-6713-462f-955f-7fcb8535064e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org-daa5182f-9078-4e4d-ab7e-3b9c54383a8c.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org-daa5182f-9078-4e4d-ab7e-3b9c54383a8c.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-2b66312b-5707-492e-81cd-55b9f49b65f1.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-2b66312b-5707-492e-81cd-55b9f49b65f1.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-47d338fd-8730-4953-94f1-2261a3d6e6a3.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-47d338fd-8730-4953-94f1-2261a3d6e6a3.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-a73705e3-9d60-41e7-be95-b417ea3eb75d.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-a73705e3-9d60-41e7-be95-b417ea3eb75d.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/orgs_github-api-test-org_teams_dummy-team-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-70263be8-4b8a-4f60-9e0a-da31aae7519f.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-70263be8-4b8a-4f60-9e0a-da31aae7519f.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-51846d5d-d6ae-4a92-b608-ecaa62c3b73b.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-51846d5d-d6ae-4a92-b608-ecaa62c3b73b.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/teams_3451996-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/user-ba4c373b-e7b2-498a-adc1-e63cacdd50cb.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/user-ba4c373b-e7b2-498a-adc1-e63cacdd50cb.json
rename to src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2-daa518.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2-daa518.json
deleted file mode 100644
index f2d8ba98bc..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2-daa518.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "daa5182f-9078-4e4d-ab7e-3b9c54383a8c",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-daa5182f-9078-4e4d-ab7e-3b9c54383a8c.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4437",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9d4203e09aeffc9b5325c2a5355275b5\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA22:159549:5E709478"
-    }
-  },
-  "uuid": "daa5182f-9078-4e4d-ab7e-3b9c54383a8c",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..7a33beb163
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "daa5182f-9078-4e4d-ab7e-3b9c54383a8c",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4437",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9d4203e09aeffc9b5325c2a5355275b5\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA22:159549:5E709478"
+    }
+  },
+  "uuid": "daa5182f-9078-4e4d-ab7e-3b9c54383a8c",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3-2b6631.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3-2b6631.json
deleted file mode 100644
index 38a9e3010c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3-2b6631.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "2b66312b-5707-492e-81cd-55b9f49b65f1",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-2b66312b-5707-492e-81cd-55b9f49b65f1.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4436",
-      "X-RateLimit-Reset": "1584436622",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"b8ddc7cdc32515a463c5e60f9f253dd1\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:12:23 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA25:159552:5E709478"
-    }
-  },
-  "uuid": "2b66312b-5707-492e-81cd-55b9f49b65f1",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3.json
new file mode 100644
index 0000000000..2b07971306
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "2b66312b-5707-492e-81cd-55b9f49b65f1",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-3.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4436",
+      "X-RateLimit-Reset": "1584436622",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"b8ddc7cdc32515a463c5e60f9f253dd1\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:12:23 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA25:159552:5E709478"
+    }
+  },
+  "uuid": "2b66312b-5707-492e-81cd-55b9f49b65f1",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5-47d338.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5-47d338.json
deleted file mode 100644
index bb58019964..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5-47d338.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "47d338fd-8730-4953-94f1-2261a3d6e6a3",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-47d338fd-8730-4953-94f1-2261a3d6e6a3.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4434",
-      "X-RateLimit-Reset": "1584436622",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"619dbe2e4e0378bda45903a72aae4856\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:12:25 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA3D:15956A:5E709479"
-    }
-  },
-  "uuid": "47d338fd-8730-4953-94f1-2261a3d6e6a3",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
-  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
-  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5.json
new file mode 100644
index 0000000000..08c399d822
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-5.json
@@ -0,0 +1,49 @@
+{
+  "id": "47d338fd-8730-4953-94f1-2261a3d6e6a3",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-5.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4434",
+      "X-RateLimit-Reset": "1584436622",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"619dbe2e4e0378bda45903a72aae4856\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:12:25 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA3D:15956A:5E709479"
+    }
+  },
+  "uuid": "47d338fd-8730-4953-94f1-2261a3d6e6a3",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
+  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-2",
+  "newScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7-a73705.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7-a73705.json
deleted file mode 100644
index 5458b6e9c2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7-a73705.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a73705e3-9d60-41e7-be95-b417ea3eb75d",
-  "name": "orgs_github-api-test-org_teams_dummy-team",
-  "request": {
-    "url": "/orgs/github-api-test-org/teams/dummy-team",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-a73705e3-9d60-41e7-be95-b417ea3eb75d.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4432",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"3760fae93c6e9cb6c970a0e6bdbcaf53\"",
-      "Last-Modified": "Tue, 17 Mar 2020 09:12:26 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA56:159586:5E70947A"
-    }
-  },
-  "uuid": "a73705e3-9d60-41e7-be95-b417ea3eb75d",
-  "persistent": true,
-  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
-  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7.json
new file mode 100644
index 0000000000..b6dfc2877d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/orgs_github-api-test-org_teams_dummy-team-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "a73705e3-9d60-41e7-be95-b417ea3eb75d",
+  "name": "orgs_github-api-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/github-api-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org_teams_dummy-team-7.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4432",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"3760fae93c6e9cb6c970a0e6bdbcaf53\"",
+      "Last-Modified": "Tue, 17 Mar 2020 09:12:26 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA56:159586:5E70947A"
+    }
+  },
+  "uuid": "a73705e3-9d60-41e7-be95-b417ea3eb75d",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-github-api-test-org-teams-dummy-team",
+  "requiredScenarioState": "scenario-1-orgs-github-api-test-org-teams-dummy-team-3",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4-70263b.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4-70263b.json
deleted file mode 100644
index f56edd69d6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4-70263b.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "70263be8-4b8a-4f60-9e0a-da31aae7519f",
-  "name": "teams_3451996",
-  "request": {
-    "url": "/teams/3451996",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"privacy\":\"closed\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3451996-70263be8-4b8a-4f60-9e0a-da31aae7519f.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4435",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"2fe6e6489fcf0675c858e5ea4b20b84d\"",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
-      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA2A:159557:5E709479",
-      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
-    }
-  },
-  "uuid": "70263be8-4b8a-4f60-9e0a-da31aae7519f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4.json
new file mode 100644
index 0000000000..bbfcc17989
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "70263be8-4b8a-4f60-9e0a-da31aae7519f",
+  "name": "teams_3451996",
+  "request": {
+    "url": "/teams/3451996",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"privacy\":\"closed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3451996-4.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4435",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"2fe6e6489fcf0675c858e5ea4b20b84d\"",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
+      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA2A:159557:5E709479",
+      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
+    }
+  },
+  "uuid": "70263be8-4b8a-4f60-9e0a-da31aae7519f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6-51846d.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6-51846d.json
deleted file mode 100644
index 3aa0ada9d1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6-51846d.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "51846d5d-d6ae-4a92-b608-ecaa62c3b73b",
-  "name": "teams_3451996",
-  "request": {
-    "url": "/teams/3451996",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"privacy\":\"secret\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "teams_3451996-51846d5d-d6ae-4a92-b608-ecaa62c3b73b.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4433",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"6921bb0eae21f588783eaca69c02f0e0\"",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "admin:org, repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
-      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA42:159570:5E70947A",
-      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
-    }
-  },
-  "uuid": "51846d5d-d6ae-4a92-b608-ecaa62c3b73b",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6.json
new file mode 100644
index 0000000000..c432cf4d1d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/teams_3451996-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "51846d5d-d6ae-4a92-b608-ecaa62c3b73b",
+  "name": "teams_3451996",
+  "request": {
+    "url": "/teams/3451996",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"privacy\":\"secret\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "teams_3451996-6.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4433",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"6921bb0eae21f588783eaca69c02f0e0\"",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "admin:org, repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Deprecation": "Sat, 01 Feb 2020 00:00:00 GMT",
+      "Sunset": "Mon, 01 Feb 2021 00:00:00 GMT",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA42:159570:5E70947A",
+      "Link": "<https://developer.github.com/changes/2020-01-21-moving-the-team-api-endpoints/>; rel=\"deprecation\"; type=\"text/html\", <https://api.github.com/organizations/7544739/team/3451996>; rel=\"alternate\""
+    }
+  },
+  "uuid": "51846d5d-d6ae-4a92-b608-ecaa62c3b73b",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1-ba4c37.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1-ba4c37.json
deleted file mode 100644
index 340c7cf202..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1-ba4c37.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "ba4c373b-e7b2-498a-adc1-e63cacdd50cb",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ba4c373b-e7b2-498a-adc1-e63cacdd50cb.json",
-    "headers": {
-      "Date": "Tue, 17 Mar 2020 09:12:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4439",
-      "X-RateLimit-Reset": "1584436621",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
-      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F8CD:0B9D:AAA18:159545:5E709478"
-    }
-  },
-  "uuid": "ba4c373b-e7b2-498a-adc1-e63cacdd50cb",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1.json
new file mode 100644
index 0000000000..78977e1245
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTeamTest/wiremock/testSetPrivacy/mappings/user-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "ba4c373b-e7b2-498a-adc1-e63cacdd50cb",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Tue, 17 Mar 2020 09:12:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4439",
+      "X-RateLimit-Reset": "1584436621",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9017502e8d08bc162064261819da0490\"",
+      "Last-Modified": "Tue, 17 Mar 2020 08:28:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:public_key, admin:repo_hook, notifications, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F8CD:0B9D:AAA18:159545:5E709478"
+    }
+  },
+  "uuid": "ba4c373b-e7b2-498a-adc1-e63cacdd50cb",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest-60eb069c-48ea-42a2-872d-2614c39e8a54.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest-60eb069c-48ea-42a2-872d-2614c39e8a54.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-05a6551a-8b5b-46c9-8429-89f8cc7b567d.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-05a6551a-8b5b-46c9-8429-89f8cc7b567d.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-b093dc53-dcdf-49dc-a181-d6b85e7c238c.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-b093dc53-dcdf-49dc-a181-d6b85e7c238c.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-bbedc2ef-9cff-41f6-89c1-ae6b06906f9e.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-bbedc2ef-9cff-41f6-89c1-ae6b06906f9e.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-5f081830-6fd0-42fa-a754-aee9a8ec37f8.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-5f081830-6fd0-42fa-a754-aee9a8ec37f8.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-e0c20fc7-e5c2-4af3-875a-3489d677a32f.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-e0c20fc7-e5c2-4af3-875a-3489d677a32f.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-add23dfd-74f9-452c-8986-0a80d2f6cbec.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-add23dfd-74f9-452c-8986-0a80d2f6cbec.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-51f469be-c974-4dcb-8272-9cb5b38d82b0.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-51f469be-c974-4dcb-8272-9cb5b38d82b0.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-c5654fe0-f432-4d1f-bda5-8b9c6931b692.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-c5654fe0-f432-4d1f-bda5-8b9c6931b692.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/user-f77e845b-f07b-4149-8538-0facc0ebfcb2.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/user-f77e845b-f07b-4149-8538-0facc0ebfcb2.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2-60eb06.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2-60eb06.json
deleted file mode 100644
index 68943999e8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2-60eb06.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "60eb069c-48ea-42a2-872d-2614c39e8a54",
-  "name": "repos_github-api-test-org_ghtreebuildertest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest-60eb069c-48ea-42a2-872d-2614c39e8a54.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4832",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4212caadae2c82a37f79df56e42986d9\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:37:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F3C:2426F6:5E16A09F"
-    }
-  },
-  "uuid": "60eb069c-48ea-42a2-872d-2614c39e8a54",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2.json
new file mode 100644
index 0000000000..f0576c8b68
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "60eb069c-48ea-42a2-872d-2614c39e8a54",
+  "name": "repos_github-api-test-org_ghtreebuildertest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest-2.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4832",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4212caadae2c82a37f79df56e42986d9\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:37:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F3C:2426F6:5E16A09F"
+    }
+  },
+  "uuid": "60eb069c-48ea-42a2-872d-2614c39e8a54",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12-05a655.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12-05a655.json
deleted file mode 100644
index 0a64f23907..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12-05a655.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "05a6551a-8b5b-46c9-8429-89f8cc7b567d",
-  "name": "repos_github-api-test-org_ghtreebuildertest_contents_app_runsh",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/app/run.sh",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-05a6551a-8b5b-46c9-8429-89f8cc7b567d.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4822",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"e9ba7ba07276a794d493db90e0384940ce2b757b\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F7D:242768:5E16A0A4"
-    }
-  },
-  "uuid": "05a6551a-8b5b-46c9-8429-89f8cc7b567d",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json
new file mode 100644
index 0000000000..5f8acd5040
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "05a6551a-8b5b-46c9-8429-89f8cc7b567d",
+  "name": "repos_github-api-test-org_ghtreebuildertest_contents_app_runsh",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/app/run.sh",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_app_runsh-12.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4822",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e9ba7ba07276a794d493db90e0384940ce2b757b\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F7D:242768:5E16A0A4"
+    }
+  },
+  "uuid": "05a6551a-8b5b-46c9-8429-89f8cc7b567d",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14-b093dc.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14-b093dc.json
deleted file mode 100644
index eabdf185ca..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14-b093dc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b093dc53-dcdf-49dc-a181-d6b85e7c238c",
-  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val1.dat",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-b093dc53-dcdf-49dc-a181-d6b85e7c238c.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4820",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F88:242772:5E16A0A5"
-    }
-  },
-  "uuid": "b093dc53-dcdf-49dc-a181-d6b85e7c238c",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json
new file mode 100644
index 0000000000..46301bdcf5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json
@@ -0,0 +1,48 @@
+{
+  "id": "b093dc53-dcdf-49dc-a181-d6b85e7c238c",
+  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val1.dat",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-14.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4820",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F88:242772:5E16A0A5"
+    }
+  },
+  "uuid": "b093dc53-dcdf-49dc-a181-d6b85e7c238c",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15-bbedc2.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15-bbedc2.json
deleted file mode 100644
index 62a2c1616d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15-bbedc2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bbedc2ef-9cff-41f6-89c1-ae6b06906f9e",
-  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val2.dat",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-bbedc2ef-9cff-41f6-89c1-ae6b06906f9e.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4819",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F90:242779:5E16A0A5"
-    }
-  },
-  "uuid": "bbedc2ef-9cff-41f6-89c1-ae6b06906f9e",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json
new file mode 100644
index 0000000000..3733dc89ef
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json
@@ -0,0 +1,48 @@
+{
+  "id": "bbedc2ef-9cff-41f6-89c1-ae6b06906f9e",
+  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val2.dat",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-15.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4819",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F90:242779:5E16A0A5"
+    }
+  },
+  "uuid": "bbedc2ef-9cff-41f6-89c1-ae6b06906f9e",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13-5f0818.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13-5f0818.json
deleted file mode 100644
index a1c8259e2b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13-5f0818.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5f081830-6fd0-42fa-a754-aee9a8ec37f8",
-  "name": "repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/doc/readme.txt",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-5f081830-6fd0-42fa-a754-aee9a8ec37f8.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4821",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fbbc875b17d1e17da06b4ee8fda46e2596c41f3c\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F84:24276E:5E16A0A5"
-    }
-  },
-  "uuid": "5f081830-6fd0-42fa-a754-aee9a8ec37f8",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json
new file mode 100644
index 0000000000..d50c7d2b93
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "5f081830-6fd0-42fa-a754-aee9a8ec37f8",
+  "name": "repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/doc/readme.txt",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_doc_readmetxt-13.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4821",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fbbc875b17d1e17da06b4ee8fda46e2596c41f3c\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:20 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F84:24276E:5E16A0A5"
+    }
+  },
+  "uuid": "5f081830-6fd0-42fa-a754-aee9a8ec37f8",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5-8e41ee.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5-8e41ee.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6-9c928c.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6-9c928c.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-7-5f2849.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-7-5f2849.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-8-37a191.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-8-37a191.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10-aa6ff1.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10-aa6ff1.json
deleted file mode 100644
index a7d8dcd9e9..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10-aa6ff1.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_commits",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/commits",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"tree\":\"b09a1698f3aeb1d462c3492007760e2579734c74\",\"message\":\"Add files\",\"parents\":[\"68a5bb512f28e6a9aa9a1b2068d9517929817dbb\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_commits-aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4824",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"9bd98a17ea499a0134fd94705114c6a7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/commits/4ae7229c06d96391696155ed9c324bde17a7b665",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F60:242743:5E16A0A3"
-    }
-  },
-  "uuid": "aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10.json
new file mode 100644
index 0000000000..8948b58766
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-10.json
@@ -0,0 +1,55 @@
+{
+  "id": "aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_commits",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/commits",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"tree\":\"b09a1698f3aeb1d462c3492007760e2579734c74\",\"message\":\"Add files\",\"parents\":[\"68a5bb512f28e6a9aa9a1b2068d9517929817dbb\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_commits-10.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4824",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"9bd98a17ea499a0134fd94705114c6a7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/commits/4ae7229c06d96391696155ed9c324bde17a7b665",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F60:242743:5E16A0A3"
+    }
+  },
+  "uuid": "aa6ff1c1-d218-47af-8d2f-0bfdf3c0f1e8",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11-e0c20f.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11-e0c20f.json
deleted file mode 100644
index 43c1487ab7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11-e0c20f.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "e0c20fc7-e5c2-4af3-875a-3489d677a32f",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"force\":false,\"sha\":\"4ae7229c06d96391696155ed9c324bde17a7b665\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-e0c20fc7-e5c2-4af3-875a-3489d677a32f.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4823",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"67c3585b5b9dce91e789db185cc6d2b3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F68:24274D:5E16A0A4"
-    }
-  },
-  "uuid": "e0c20fc7-e5c2-4af3-875a-3489d677a32f",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json
new file mode 100644
index 0000000000..4f30179c34
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json
@@ -0,0 +1,54 @@
+{
+  "id": "e0c20fc7-e5c2-4af3-875a-3489d677a32f",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"force\":false,\"sha\":\"4ae7229c06d96391696155ed9c324bde17a7b665\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-11.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4823",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"67c3585b5b9dce91e789db185cc6d2b3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F68:24274D:5E16A0A4"
+    }
+  },
+  "uuid": "e0c20fc7-e5c2-4af3-875a-3489d677a32f",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-add23d.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-add23d.json
deleted file mode 100644
index 1d17ce9a72..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-add23d.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "add23dfd-74f9-452c-8986-0a80d2f6cbec",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-add23dfd-74f9-452c-8986-0a80d2f6cbec.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4831",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c291348e1a49bf777324e08452837f86\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:37:30 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F40:24271E:5E16A0A0"
-    }
-  },
-  "uuid": "add23dfd-74f9-452c-8986-0a80d2f6cbec",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
new file mode 100644
index 0000000000..0ca4184203
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "add23dfd-74f9-452c-8986-0a80d2f6cbec",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4831",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c291348e1a49bf777324e08452837f86\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:37:30 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F40:24271E:5E16A0A0"
+    }
+  },
+  "uuid": "add23dfd-74f9-452c-8986-0a80d2f6cbec",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9-51f469.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9-51f469.json
deleted file mode 100644
index 98f7c2b47e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9-51f469.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "51f469be-c974-4dcb-8272-9cb5b38d82b0",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"base_tree\":\"68a5bb512f28e6a9aa9a1b2068d9517929817dbb\",\"tree\":[{\"path\":\"app/run.sh\",\"mode\":\"100755\",\"type\":\"blob\",\"sha\":\"e9ba7ba07276a794d493db90e0384940ce2b757b\"},{\"path\":\"doc/readme.txt\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"fbbc875b17d1e17da06b4ee8fda46e2596c41f3c\"},{\"path\":\"data/val1.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"},{\"path\":\"data/val2.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"}]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees-51f469be-c974-4dcb-8272-9cb5b38d82b0.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4825",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"79d0ed896a470f6bafc50e57da0abd3b\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/trees/b09a1698f3aeb1d462c3492007760e2579734c74",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F5C:24273F:5E16A0A3"
-    }
-  },
-  "uuid": "51f469be-c974-4dcb-8272-9cb5b38d82b0",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9.json
new file mode 100644
index 0000000000..c67fbe25b1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-9.json
@@ -0,0 +1,55 @@
+{
+  "id": "51f469be-c974-4dcb-8272-9cb5b38d82b0",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"base_tree\":\"68a5bb512f28e6a9aa9a1b2068d9517929817dbb\",\"tree\":[{\"path\":\"app/run.sh\",\"mode\":\"100755\",\"type\":\"blob\",\"sha\":\"e9ba7ba07276a794d493db90e0384940ce2b757b\"},{\"path\":\"doc/readme.txt\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"fbbc875b17d1e17da06b4ee8fda46e2596c41f3c\"},{\"path\":\"data/val1.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"},{\"path\":\"data/val2.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"}]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees-9.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4825",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"79d0ed896a470f6bafc50e57da0abd3b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/trees/b09a1698f3aeb1d462c3492007760e2579734c74",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F5C:24273F:5E16A0A3"
+    }
+  },
+  "uuid": "51f469be-c974-4dcb-8272-9cb5b38d82b0",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-c5654f.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-c5654f.json
deleted file mode 100644
index 0ccc524485..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-c5654f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c5654fe0-f432-4d1f-bda5-8b9c6931b692",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees_master",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees/master?recursive=1",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees_master-c5654fe0-f432-4d1f-bda5-8b9c6931b692.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:17 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4830",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"66e290ce2aad04849b5083fb634d9381\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:37:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F46:242723:5E16A0A1"
-    }
-  },
-  "uuid": "c5654fe0-f432-4d1f-bda5-8b9c6931b692",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
new file mode 100644
index 0000000000..b29fd42b3f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "c5654fe0-f432-4d1f-bda5-8b9c6931b692",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees_master",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees/master?recursive=1",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:17 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4830",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"66e290ce2aad04849b5083fb634d9381\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:37:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F46:242723:5E16A0A1"
+    }
+  },
+  "uuid": "c5654fe0-f432-4d1f-bda5-8b9c6931b692",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1-f77e84.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1-f77e84.json
deleted file mode 100644
index 9a1d06ce06..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1-f77e84.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f77e845b-f07b-4149-8538-0facc0ebfcb2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f77e845b-f07b-4149-8538-0facc0ebfcb2.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4839",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E86E:34E9:1D0F1F:2426F3:5E16A09F"
-    }
-  },
-  "uuid": "f77e845b-f07b-4149-8538-0facc0ebfcb2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1.json
new file mode 100644
index 0000000000..51ec706145
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "f77e845b-f07b-4149-8538-0facc0ebfcb2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4839",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E86E:34E9:1D0F1F:2426F3:5E16A09F"
+    }
+  },
+  "uuid": "f77e845b-f07b-4149-8538-0facc0ebfcb2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest-f665d43c-dc68-49aa-8402-6e105989abea.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest-f665d43c-dc68-49aa-8402-6e105989abea.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-33349f33-4070-4061-b392-c7f61d38b7ec.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-33349f33-4070-4061-b392-c7f61d38b7ec.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-d4f75274-523b-497b-bfc0-80f9ec9f3e62.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-d4f75274-523b-497b-bfc0-80f9ec9f3e62.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-31ea7502-2364-4867-bd76-d6fa050b6256.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-31ea7502-2364-4867-bd76-d6fa050b6256.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_commits-8.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-683572f1-512c-4a6f-b766-7447ed7908fe.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-683572f1-512c-4a6f-b766-7447ed7908fe.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-85167f57-6ea5-4b27-8130-a71e81fdc4f3.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-85167f57-6ea5-4b27-8130-a71e81fdc4f3.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-2c2c7033-1c85-455f-b7b8-0b1b82add074.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-2c2c7033-1c85-455f-b7b8-0b1b82add074.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees-7.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-2193534b-ce04-4633-95ae-aa382de15657.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-2193534b-ce04-4633-95ae-aa382de15657.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/user-ef48e63e-7fa6-4ece-ae75-623cb2b525b4.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/user-ef48e63e-7fa6-4ece-ae75-623cb2b525b4.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2-f665d4.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2-f665d4.json
deleted file mode 100644
index 2c3db0eeb7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2-f665d4.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f665d43c-dc68-49aa-8402-6e105989abea",
-  "name": "repos_github-api-test-org_ghtreebuildertest",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest-f665d43c-dc68-49aa-8402-6e105989abea.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4802",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5cf9fb29a46c49e5f93ed37c1ca9d3ac\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:27 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:450F2:57F51:5E16A0AA"
-    }
-  },
-  "uuid": "f665d43c-dc68-49aa-8402-6e105989abea",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2.json
new file mode 100644
index 0000000000..a424619001
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f665d43c-dc68-49aa-8402-6e105989abea",
+  "name": "repos_github-api-test-org_ghtreebuildertest",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest-2.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4802",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5cf9fb29a46c49e5f93ed37c1ca9d3ac\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:27 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:450F2:57F51:5E16A0AA"
+    }
+  },
+  "uuid": "f665d43c-dc68-49aa-8402-6e105989abea",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10-33349f.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10-33349f.json
deleted file mode 100644
index 3846a35e3d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10-33349f.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "33349f33-4070-4061-b392-c7f61d38b7ec",
-  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val1.dat",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-33349f33-4070-4061-b392-c7f61d38b7ec.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4794",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:45108:57F76:5E16A0AF"
-    }
-  },
-  "uuid": "33349f33-4070-4061-b392-c7f61d38b7ec",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json
new file mode 100644
index 0000000000..1a44559310
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "33349f33-4070-4061-b392-c7f61d38b7ec",
+  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val1.dat",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val1dat-10.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4794",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:45108:57F76:5E16A0AF"
+    }
+  },
+  "uuid": "33349f33-4070-4061-b392-c7f61d38b7ec",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11-d4f752.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11-d4f752.json
deleted file mode 100644
index 0ced2072b8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11-d4f752.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d4f75274-523b-497b-bfc0-80f9ec9f3e62",
-  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val2.dat",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-d4f75274-523b-497b-bfc0-80f9ec9f3e62.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4793",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:4510A:57F78:5E16A0AF"
-    }
-  },
-  "uuid": "d4f75274-523b-497b-bfc0-80f9ec9f3e62",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json
new file mode 100644
index 0000000000..6dfd1237c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "d4f75274-523b-497b-bfc0-80f9ec9f3e62",
+  "name": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/contents/data/val2.dat",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_contents_data_val2dat-11.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4793",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:4510A:57F78:5E16A0AF"
+    }
+  },
+  "uuid": "d4f75274-523b-497b-bfc0-80f9ec9f3e62",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5-a844c6.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5-a844c6.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6-95bf11.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6-95bf11.json
rename to src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_blobs-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8-31ea75.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8-31ea75.json
deleted file mode 100644
index e69ab0d00a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8-31ea75.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "31ea7502-2364-4867-bd76-d6fa050b6256",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_commits",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/commits",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"tree\":\"a0f9d7609efd4023ba2dcaa30e91324ae2faa739\",\"message\":\"Add files\",\"parents\":[\"f8478036a8bbe6b53b508468f2a224384318ae71\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_commits-31ea7502-2364-4867-bd76-d6fa050b6256.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4796",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"6b0c56e9e27ffc519b643840f958a68d\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/commits/732dc48d0d0bca7c43fb2fc7164bbd5accfd6350",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:45104:57F72:5E16A0AD"
-    }
-  },
-  "uuid": "31ea7502-2364-4867-bd76-d6fa050b6256",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8.json
new file mode 100644
index 0000000000..4f0473afac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_commits-8.json
@@ -0,0 +1,55 @@
+{
+  "id": "31ea7502-2364-4867-bd76-d6fa050b6256",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_commits",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/commits",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"tree\":\"a0f9d7609efd4023ba2dcaa30e91324ae2faa739\",\"message\":\"Add files\",\"parents\":[\"f8478036a8bbe6b53b508468f2a224384318ae71\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_commits-8.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4796",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"6b0c56e9e27ffc519b643840f958a68d\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/commits/732dc48d0d0bca7c43fb2fc7164bbd5accfd6350",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:45104:57F72:5E16A0AD"
+    }
+  },
+  "uuid": "31ea7502-2364-4867-bd76-d6fa050b6256",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-683572.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-683572.json
deleted file mode 100644
index 78d0a8a6f3..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3-683572.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "683572f1-512c-4a6f-b766-7447ed7908fe",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-683572f1-512c-4a6f-b766-7447ed7908fe.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4801",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b549e859a4cde591434789ce38a18e36\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:27 GMT",
-      "X-Poll-Interval": "300",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:450F4:57F5E:5E16A0AC"
-    }
-  },
-  "uuid": "683572f1-512c-4a6f-b766-7447ed7908fe",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
new file mode 100644
index 0000000000..3477601959
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json
@@ -0,0 +1,49 @@
+{
+  "id": "683572f1-512c-4a6f-b766-7447ed7908fe",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-3.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4801",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b549e859a4cde591434789ce38a18e36\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:27 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:450F4:57F5E:5E16A0AC"
+    }
+  },
+  "uuid": "683572f1-512c-4a6f-b766-7447ed7908fe",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9-85167f.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9-85167f.json
deleted file mode 100644
index 417aff7f44..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9-85167f.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "id": "85167f57-6ea5-4b27-8130-a71e81fdc4f3",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
-    "method": "PATCH",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"force\":false,\"sha\":\"732dc48d0d0bca7c43fb2fc7164bbd5accfd6350\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-85167f57-6ea5-4b27-8130-a71e81fdc4f3.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4795",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dd4ccc23cb17a971d3f1932b92abdd82\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:45107:57F74:5E16A0AE"
-    }
-  },
-  "uuid": "85167f57-6ea5-4b27-8130-a71e81fdc4f3",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json
new file mode 100644
index 0000000000..7512ba8e11
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json
@@ -0,0 +1,54 @@
+{
+  "id": "85167f57-6ea5-4b27-8130-a71e81fdc4f3",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/refs/heads/master",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"force\":false,\"sha\":\"732dc48d0d0bca7c43fb2fc7164bbd5accfd6350\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_refs_heads_master-9.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4795",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dd4ccc23cb17a971d3f1932b92abdd82\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:45107:57F74:5E16A0AE"
+    }
+  },
+  "uuid": "85167f57-6ea5-4b27-8130-a71e81fdc4f3",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7-2c2c70.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7-2c2c70.json
deleted file mode 100644
index cb049aaf62..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7-2c2c70.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "2c2c7033-1c85-455f-b7b8-0b1b82add074",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"base_tree\":\"f8478036a8bbe6b53b508468f2a224384318ae71\",\"tree\":[{\"path\":\"data/val1.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"},{\"path\":\"data/val2.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"}]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees-2c2c7033-1c85-455f-b7b8-0b1b82add074.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4797",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"4fb3efd7fb879e08e1e7a8acfe1a2f01\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/trees/a0f9d7609efd4023ba2dcaa30e91324ae2faa739",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:450FF:57F68:5E16A0AD"
-    }
-  },
-  "uuid": "2c2c7033-1c85-455f-b7b8-0b1b82add074",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7.json
new file mode 100644
index 0000000000..08e53cd137
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees-7.json
@@ -0,0 +1,55 @@
+{
+  "id": "2c2c7033-1c85-455f-b7b8-0b1b82add074",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"base_tree\":\"f8478036a8bbe6b53b508468f2a224384318ae71\",\"tree\":[{\"path\":\"data/val1.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"aed2973e4b8a7ff1b30ff5c4751e5a2b38989e74\"},{\"path\":\"data/val2.dat\",\"mode\":\"100644\",\"type\":\"blob\",\"sha\":\"5bd8bb897b13225c93a1d26baa88c96b7bd5d817\"}]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees-7.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4797",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"4fb3efd7fb879e08e1e7a8acfe1a2f01\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/GHTreeBuilderTest/git/trees/a0f9d7609efd4023ba2dcaa30e91324ae2faa739",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:450FF:57F68:5E16A0AD"
+    }
+  },
+  "uuid": "2c2c7033-1c85-455f-b7b8-0b1b82add074",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-219353.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-219353.json
deleted file mode 100644
index cff7e7b70d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4-219353.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2193534b-ce04-4633-95ae-aa382de15657",
-  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees_master",
-  "request": {
-    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees/master?recursive=1",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees_master-2193534b-ce04-4633-95ae-aa382de15657.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4800",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bc1dabae0f1da7c131c222066ece739f\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:40:27 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:450F6:57F5F:5E16A0AC"
-    }
-  },
-  "uuid": "2193534b-ce04-4633-95ae-aa382de15657",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
new file mode 100644
index 0000000000..cb801f17fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "2193534b-ce04-4633-95ae-aa382de15657",
+  "name": "repos_github-api-test-org_ghtreebuildertest_git_trees_master",
+  "request": {
+    "url": "/repos/github-api-test-org/GHTreeBuilderTest/git/trees/master?recursive=1",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_ghtreebuildertest_git_trees_master-4.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4800",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bc1dabae0f1da7c131c222066ece739f\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:40:27 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:450F6:57F5F:5E16A0AC"
+    }
+  },
+  "uuid": "2193534b-ce04-4633-95ae-aa382de15657",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1-ef48e6.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1-ef48e6.json
deleted file mode 100644
index b756cbfee0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1-ef48e6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ef48e63e-7fa6-4ece-ae75-623cb2b525b4",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ef48e63e-7fa6-4ece-ae75-623cb2b525b4.json",
-    "headers": {
-      "Date": "Thu, 09 Jan 2020 03:40:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4809",
-      "X-RateLimit-Reset": "1578544466",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
-      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E87C:6E51:450EA:57F50:5E16A0AA"
-    }
-  },
-  "uuid": "ef48e63e-7fa6-4ece-ae75-623cb2b525b4",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1.json
new file mode 100644
index 0000000000..5d9e46f834
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "ef48e63e-7fa6-4ece-ae75-623cb2b525b4",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 09 Jan 2020 03:40:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4809",
+      "X-RateLimit-Reset": "1578544466",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3125f2b9cabf1f8acc420ee197db0f97\"",
+      "Last-Modified": "Thu, 09 Jan 2020 03:28:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E87C:6E51:450EA:57F50:5E16A0AA"
+    }
+  },
+  "uuid": "ef48e63e-7fa6-4ece-ae75-623cb2b525b4",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user-9c77ca90-ac6b-4375-8c32-7669b7dec98d.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user-9c77ca90-ac6b-4375-8c32-7669b7dec98d.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user_repos-1c6314f8-ce12-4181-8ba9-d7389c1774e9.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user_repos-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user_repos-1c6314f8-ce12-4181-8ba9-d7389c1774e9.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/user_repos-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/users_kohsuke-f2bb88fe-c538-45f8-88cb-7a3acaca2544.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/users_kohsuke-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/users_kohsuke-f2bb88fe-c538-45f8-88cb-7a3acaca2544.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/__files/users_kohsuke-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/repos_kohsuke_github-user-test-private-repo-4-666cac.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/repos_kohsuke_github-user-test-private-repo-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/repos_kohsuke_github-user-test-private-repo-4-666cac.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/repos_kohsuke_github-user-test-private-repo-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1-9c77ca.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1-9c77ca.json
deleted file mode 100644
index 33ee68825e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1-9c77ca.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "9c77ca90-ac6b-4375-8c32-7669b7dec98d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9c77ca90-ac6b-4375-8c32-7669b7dec98d.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Fri, 31 Jan 2020 18:52:44 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1580498839",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"444582ac6464d28b8a4c8914fb11b2ea\"",
-      "Last-Modified": "Fri, 31 Jan 2020 17:19:20 GMT",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "3123:3DD0:725F2C:115653E:5E34777B"
-    }
-  },
-  "uuid": "9c77ca90-ac6b-4375-8c32-7669b7dec98d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1.json
new file mode 100644
index 0000000000..2e0f4e909e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "9c77ca90-ac6b-4375-8c32-7669b7dec98d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Fri, 31 Jan 2020 18:52:44 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1580498839",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"444582ac6464d28b8a4c8914fb11b2ea\"",
+      "Last-Modified": "Fri, 31 Jan 2020 17:19:20 GMT",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "3123:3DD0:725F2C:115653E:5E34777B"
+    }
+  },
+  "uuid": "9c77ca90-ac6b-4375-8c32-7669b7dec98d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2-1c6314.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2-1c6314.json
deleted file mode 100644
index 949ab895f6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2-1c6314.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "1c6314f8-ce12-4181-8ba9-d7389c1774e9",
-  "name": "user_repos",
-  "request": {
-    "url": "/user/repos",
-    "method": "POST",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"private\":true,\"name\":\"github-user-test-private-repo\",\"description\":\"a test private repository used to test kohsuke's github-api\",\"homepage\":\"http://github-api.kohsuke.org/\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "user_repos-1c6314f8-ce12-4181-8ba9-d7389c1774e9.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Fri, 31 Jan 2020 18:52:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4952",
-      "X-RateLimit-Reset": "1580498839",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "\"939fd186230e8cf21c2e42ae3b256921\"",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "public_repo, repo",
-      "Location": "https://api.github.com/repos/kohsuke/github-user-test-private-repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "3123:3DD0:725F68:115655A:5E34777C"
-    }
-  },
-  "uuid": "1c6314f8-ce12-4181-8ba9-d7389c1774e9",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2.json
new file mode 100644
index 0000000000..8317b94d44
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/user_repos-2.json
@@ -0,0 +1,52 @@
+{
+  "id": "1c6314f8-ce12-4181-8ba9-d7389c1774e9",
+  "name": "user_repos",
+  "request": {
+    "url": "/user/repos",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":true,\"name\":\"github-user-test-private-repo\",\"description\":\"a test private repository used to test kohsuke's github-api\",\"homepage\":\"http://github-api.kohsuke.org/\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "user_repos-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Fri, 31 Jan 2020 18:52:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4952",
+      "X-RateLimit-Reset": "1580498839",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "\"939fd186230e8cf21c2e42ae3b256921\"",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "public_repo, repo",
+      "Location": "https://api.github.com/repos/kohsuke/github-user-test-private-repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "3123:3DD0:725F68:115655A:5E34777C"
+    }
+  },
+  "uuid": "1c6314f8-ce12-4181-8ba9-d7389c1774e9",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3-f2bb88.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3-f2bb88.json
deleted file mode 100644
index 2c08b7fbd2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3-f2bb88.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "f2bb88fe-c538-45f8-88cb-7a3acaca2544",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-f2bb88fe-c538-45f8-88cb-7a3acaca2544.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Fri, 31 Jan 2020 18:52:46 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1580498839",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "W/\"0b40f25c12310d9b484a8e9812ffc9a8\"",
-      "Last-Modified": "Fri, 31 Jan 2020 17:19:20 GMT",
-      "X-OAuth-Scopes": "delete_repo, repo, user",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "3123:3DD0:725FDA:115668B:5E34777E"
-    }
-  },
-  "uuid": "f2bb88fe-c538-45f8-88cb-7a3acaca2544",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3.json
new file mode 100644
index 0000000000..b4245362d0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/createAndCountPrivateRepos/mappings/users_kohsuke-3.json
@@ -0,0 +1,45 @@
+{
+  "id": "f2bb88fe-c538-45f8-88cb-7a3acaca2544",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-3.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Fri, 31 Jan 2020 18:52:46 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1580498839",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "W/\"0b40f25c12310d9b484a8e9812ffc9a8\"",
+      "Last-Modified": "Fri, 31 Jan 2020 17:19:20 GMT",
+      "X-OAuth-Scopes": "delete_repo, repo, user",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "3123:3DD0:725FDA:115668B:5E34777E"
+    }
+  },
+  "uuid": "f2bb88fe-c538-45f8-88cb-7a3acaca2544",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler-11f4235a-9149-4727-bb9b-91b6dce384b5.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler-11f4235a-9149-4727-bb9b-91b6dce384b5.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler_keys-395dc00a-5234-4866-815c-d7b49cdd0157.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler_keys-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler_keys-395dc00a-5234-4866-815c-d7b49cdd0157.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/__files/users_rtyler_keys-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1-11f423.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1-11f423.json
deleted file mode 100644
index b5f99d406b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1-11f423.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "11f4235a-9149-4727-bb9b-91b6dce384b5",
-  "name": "users_rtyler",
-  "request": {
-    "url": "/users/rtyler",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_rtyler-11f4235a-9149-4727-bb9b-91b6dce384b5.json",
-    "headers": {
-      "Date": "Tue, 17 Sep 2019 12:55:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "42",
-      "X-RateLimit-Reset": "1568727505",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c51918a9f877202da96a3904b2445a4f\"",
-      "Last-Modified": "Wed, 24 Apr 2019 00:04:36 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EA4A:354F9:5E84C1B:7289588:5D80D7C9"
-    }
-  },
-  "uuid": "11f4235a-9149-4727-bb9b-91b6dce384b5",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1.json
new file mode 100644
index 0000000000..db9d19eb9d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "11f4235a-9149-4727-bb9b-91b6dce384b5",
+  "name": "users_rtyler",
+  "request": {
+    "url": "/users/rtyler",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_rtyler-1.json",
+    "headers": {
+      "Date": "Tue, 17 Sep 2019 12:55:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "42",
+      "X-RateLimit-Reset": "1568727505",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c51918a9f877202da96a3904b2445a4f\"",
+      "Last-Modified": "Wed, 24 Apr 2019 00:04:36 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EA4A:354F9:5E84C1B:7289588:5D80D7C9"
+    }
+  },
+  "uuid": "11f4235a-9149-4727-bb9b-91b6dce384b5",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2-395dc0.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2-395dc0.json
deleted file mode 100644
index b01973b1f2..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2-395dc0.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "395dc00a-5234-4866-815c-d7b49cdd0157",
-  "name": "users_rtyler_keys",
-  "request": {
-    "url": "/users/rtyler/keys",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_rtyler_keys-395dc00a-5234-4866-815c-d7b49cdd0157.json",
-    "headers": {
-      "Date": "Tue, 17 Sep 2019 12:55:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "41",
-      "X-RateLimit-Reset": "1568727505",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"257fbc4218f6908012a1054fb084df45\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EA4A:354F9:5E84CA9:7289633:5D80D7CA"
-    }
-  },
-  "uuid": "395dc00a-5234-4866-815c-d7b49cdd0157",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2.json
new file mode 100644
index 0000000000..f1a40642f9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/getKeys/mappings/users_rtyler_keys-2.json
@@ -0,0 +1,45 @@
+{
+  "id": "395dc00a-5234-4866-815c-d7b49cdd0157",
+  "name": "users_rtyler_keys",
+  "request": {
+    "url": "/users/rtyler/keys",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_rtyler_keys-2.json",
+    "headers": {
+      "Date": "Tue, 17 Sep 2019 12:55:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "41",
+      "X-RateLimit-Reset": "1568727505",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"257fbc4218f6908012a1054fb084df45\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EA4A:354F9:5E84CA9:7289633:5D80D7CA"
+    }
+  },
+  "uuid": "395dc00a-5234-4866-815c-d7b49cdd0157",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/user-ca1c867f-b2ed-4064-80c5-8cfd1c50290f.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/user-ca1c867f-b2ed-4064-80c5-8cfd1c50290f.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler-b56699fa-976a-4309-abc2-cece79cb70d7.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler-b56699fa-976a-4309-abc2-cece79cb70d7.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_followers-5d12f119-f036-4a78-a192-3af769a82f87.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_followers-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_followers-5d12f119-f036-4a78-a192-3af769a82f87.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_followers-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_following-51f79259-5780-473e-b593-e2a010f0b430.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_following-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_following-51f79259-5780-473e-b593-e2a010f0b430.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/__files/users_rtyler_following-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1-ca1c86.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1-ca1c86.json
deleted file mode 100644
index 095ad6e492..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1-ca1c86.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "ca1c867f-b2ed-4064-80c5-8cfd1c50290f",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ca1c867f-b2ed-4064-80c5-8cfd1c50290f.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:01:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDFE:80B1:5E8F3B:6D2ECA:5D74A736"
-    }
-  },
-  "uuid": "ca1c867f-b2ed-4064-80c5-8cfd1c50290f",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1.json
new file mode 100644
index 0000000000..d115445546
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "ca1c867f-b2ed-4064-80c5-8cfd1c50290f",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:01:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDFE:80B1:5E8F3B:6D2ECA:5D74A736"
+    }
+  },
+  "uuid": "ca1c867f-b2ed-4064-80c5-8cfd1c50290f",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2-b56699.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2-b56699.json
deleted file mode 100644
index ea1578332a..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2-b56699.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b56699fa-976a-4309-abc2-cece79cb70d7",
-  "name": "users_rtyler",
-  "request": {
-    "url": "/users/rtyler",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_rtyler-b56699fa-976a-4309-abc2-cece79cb70d7.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:01:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f13c58cd9f3dd2edb520a621b6c530d4\"",
-      "Last-Modified": "Wed, 24 Apr 2019 00:04:36 GMT",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDFE:80B1:5E8F4F:6D2ED2:5D74A736"
-    }
-  },
-  "uuid": "b56699fa-976a-4309-abc2-cece79cb70d7",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2.json
new file mode 100644
index 0000000000..3f61666829
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "b56699fa-976a-4309-abc2-cece79cb70d7",
+  "name": "users_rtyler",
+  "request": {
+    "url": "/users/rtyler",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_rtyler-2.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:01:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f13c58cd9f3dd2edb520a621b6c530d4\"",
+      "Last-Modified": "Wed, 24 Apr 2019 00:04:36 GMT",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDFE:80B1:5E8F4F:6D2ED2:5D74A736"
+    }
+  },
+  "uuid": "b56699fa-976a-4309-abc2-cece79cb70d7",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3-5d12f1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3-5d12f1.json
deleted file mode 100644
index 6df280ff35..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3-5d12f1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5d12f119-f036-4a78-a192-3af769a82f87",
-  "name": "users_rtyler_followers",
-  "request": {
-    "url": "/users/rtyler/followers",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_rtyler_followers-5d12f119-f036-4a78-a192-3af769a82f87.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:01:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4969",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dd9b3c995ba6c5f222f409fb1407a292\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Link": "<https://api.github.com/user/26594/followers?page=2>; rel=\"next\", <https://api.github.com/user/26594/followers?page=14>; rel=\"last\"",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDFE:80B1:5E8F56:6D2EEB:5D74A737"
-    }
-  },
-  "uuid": "5d12f119-f036-4a78-a192-3af769a82f87",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3.json
new file mode 100644
index 0000000000..2746c03e18
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_followers-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "5d12f119-f036-4a78-a192-3af769a82f87",
+  "name": "users_rtyler_followers",
+  "request": {
+    "url": "/users/rtyler/followers",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_rtyler_followers-3.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:01:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4969",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dd9b3c995ba6c5f222f409fb1407a292\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Link": "<https://api.github.com/user/26594/followers?page=2>; rel=\"next\", <https://api.github.com/user/26594/followers?page=14>; rel=\"last\"",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDFE:80B1:5E8F56:6D2EEB:5D74A737"
+    }
+  },
+  "uuid": "5d12f119-f036-4a78-a192-3af769a82f87",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4-51f792.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4-51f792.json
deleted file mode 100644
index a00a88663c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4-51f792.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "51f79259-5780-473e-b593-e2a010f0b430",
-  "name": "users_rtyler_following",
-  "request": {
-    "url": "/users/rtyler/following",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_rtyler_following-51f79259-5780-473e-b593-e2a010f0b430.json",
-    "headers": {
-      "Date": "Sun, 08 Sep 2019 07:01:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "1567929276",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0c0837f539c6acc99e3695975e878f01\"",
-      "X-OAuth-Scopes": "gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Link": "<https://api.github.com/user/26594/following?page=2>; rel=\"next\", <https://api.github.com/user/26594/following?page=2>; rel=\"last\"",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FDFE:80B1:5E8F66:6D2EF6:5D74A737"
-    }
-  },
-  "uuid": "51f79259-5780-473e-b593-e2a010f0b430",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4.json
new file mode 100644
index 0000000000..7373590c41
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listFollowsAndFollowers/mappings/users_rtyler_following-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "51f79259-5780-473e-b593-e2a010f0b430",
+  "name": "users_rtyler_following",
+  "request": {
+    "url": "/users/rtyler/following",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_rtyler_following-4.json",
+    "headers": {
+      "Date": "Sun, 08 Sep 2019 07:01:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "1567929276",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0c0837f539c6acc99e3695975e878f01\"",
+      "X-OAuth-Scopes": "gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Link": "<https://api.github.com/user/26594/following?page=2>; rel=\"next\", <https://api.github.com/user/26594/following?page=2>; rel=\"last\"",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FDFE:80B1:5E8F66:6D2EF6:5D74A737"
+    }
+  },
+  "uuid": "51f79259-5780-473e-b593-e2a010f0b430",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user-90560989-d163-4e6c-8b13-c3133fc2b1fd.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user-90560989-d163-4e6c-8b13-c3133fc2b1fd.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-1eeb7b56-56af-4143-9921-1169995e7e3c.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-1eeb7b56-56af-4143-9921-1169995e7e3c.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-d1c08a5b-3d03-404b-a293-56fb14f59a39.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-d1c08a5b-3d03-404b-a293-56fb14f59a39.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-5.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-1e91f19a-22d2-4035-97b1-d5ef5e3664ba.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-1e91f19a-22d2-4035-97b1-d5ef5e3664ba.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/user_50003_repos-6.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke-da994e50-330e-46e8-97ee-f4da86418bca.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke-da994e50-330e-46e8-97ee-f4da86418bca.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke_repos-9f7b75e8-6027-4a8d-adc7-2a75326dcd86.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke_repos-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke_repos-9f7b75e8-6027-4a8d-adc7-2a75326dcd86.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/__files/users_kohsuke_repos-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1-905609.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1-905609.json
deleted file mode 100644
index 25da5cc4b6..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1-905609.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "90560989-d163-4e6c-8b13-c3133fc2b1fd",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-90560989-d163-4e6c-8b13-c3133fc2b1fd.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:07 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4790",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EAB8:78ED:342E8CB:3E4E621:5D9BA40F"
-    }
-  },
-  "uuid": "90560989-d163-4e6c-8b13-c3133fc2b1fd",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1.json
new file mode 100644
index 0000000000..fee94d3bd1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "90560989-d163-4e6c-8b13-c3133fc2b1fd",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:07 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4790",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EAB8:78ED:342E8CB:3E4E621:5D9BA40F"
+    }
+  },
+  "uuid": "90560989-d163-4e6c-8b13-c3133fc2b1fd",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4-1eeb7b.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4-1eeb7b.json
deleted file mode 100644
index 8c7045a81b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4-1eeb7b.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1eeb7b56-56af-4143-9921-1169995e7e3c",
-  "name": "user_50003_repos",
-  "request": {
-    "url": "/user/50003/repos?per_page=30&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_50003_repos-1eeb7b56-56af-4143-9921-1169995e7e3c.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4786",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9f4cbae525f6b1ffb5ba3e30040ef800\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EAB8:78ED:342EA22:3E4E78F:5D9BA411",
-      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=30&page=3>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1eeb7b56-56af-4143-9921-1169995e7e3c",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4.json
new file mode 100644
index 0000000000..f39a636466
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "1eeb7b56-56af-4143-9921-1169995e7e3c",
+  "name": "user_50003_repos",
+  "request": {
+    "url": "/user/50003/repos?per_page=30&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_50003_repos-4.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4786",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9f4cbae525f6b1ffb5ba3e30040ef800\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EAB8:78ED:342EA22:3E4E78F:5D9BA411",
+      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=30&page=3>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1eeb7b56-56af-4143-9921-1169995e7e3c",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5-d1c08a.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5-d1c08a.json
deleted file mode 100644
index 8def1d480f..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5-d1c08a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d1c08a5b-3d03-404b-a293-56fb14f59a39",
-  "name": "user_50003_repos",
-  "request": {
-    "url": "/user/50003/repos?per_page=30&page=3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_50003_repos-d1c08a5b-3d03-404b-a293-56fb14f59a39.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4785",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3610f9c3c612fdd74116619b025e7cc1\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EAB8:78ED:342EAB7:3E4E852:5D9BA412",
-      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=2>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=30&page=4>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "d1c08a5b-3d03-404b-a293-56fb14f59a39",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5.json
new file mode 100644
index 0000000000..3b43239f30
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "d1c08a5b-3d03-404b-a293-56fb14f59a39",
+  "name": "user_50003_repos",
+  "request": {
+    "url": "/user/50003/repos?per_page=30&page=3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_50003_repos-5.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4785",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3610f9c3c612fdd74116619b025e7cc1\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EAB8:78ED:342EAB7:3E4E852:5D9BA412",
+      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=2>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=30&page=4>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "d1c08a5b-3d03-404b-a293-56fb14f59a39",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6-1e91f1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6-1e91f1.json
deleted file mode 100644
index 392f781153..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6-1e91f1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "1e91f19a-22d2-4035-97b1-d5ef5e3664ba",
-  "name": "user_50003_repos",
-  "request": {
-    "url": "/user/50003/repos?per_page=30&page=4",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_50003_repos-1e91f19a-22d2-4035-97b1-d5ef5e3664ba.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4784",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"986befafb1b581887789ee40f9015685\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EAB8:78ED:342EB20:3E4E8C4:5D9BA412",
-      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=3>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=30&page=5>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "1e91f19a-22d2-4035-97b1-d5ef5e3664ba",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6.json
new file mode 100644
index 0000000000..11d7737d78
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/user_50003_repos-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "1e91f19a-22d2-4035-97b1-d5ef5e3664ba",
+  "name": "user_50003_repos",
+  "request": {
+    "url": "/user/50003/repos?per_page=30&page=4",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_50003_repos-6.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4784",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"986befafb1b581887789ee40f9015685\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EAB8:78ED:342EB20:3E4E8C4:5D9BA412",
+      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=3>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=30&page=5>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=30&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "1e91f19a-22d2-4035-97b1-d5ef5e3664ba",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2-da994e.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2-da994e.json
deleted file mode 100644
index 5a1b932dc8..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2-da994e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "da994e50-330e-46e8-97ee-f4da86418bca",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-da994e50-330e-46e8-97ee-f4da86418bca.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:08 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4788",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"03bc56e9984bf18e3f1d56c2a48227a4\"",
-      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EAB8:78ED:342E93E:3E4E645:5D9BA40F"
-    }
-  },
-  "uuid": "da994e50-330e-46e8-97ee-f4da86418bca",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2.json
new file mode 100644
index 0000000000..0958c5d1c2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "da994e50-330e-46e8-97ee-f4da86418bca",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4788",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"03bc56e9984bf18e3f1d56c2a48227a4\"",
+      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EAB8:78ED:342E93E:3E4E645:5D9BA40F"
+    }
+  },
+  "uuid": "da994e50-330e-46e8-97ee-f4da86418bca",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3-9f7b75.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3-9f7b75.json
deleted file mode 100644
index 02a1e0af9e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3-9f7b75.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9f7b75e8-6027-4a8d-adc7-2a75326dcd86",
-  "name": "users_kohsuke_repos",
-  "request": {
-    "url": "/users/kohsuke/repos?per_page=30",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke_repos-9f7b75e8-6027-4a8d-adc7-2a75326dcd86.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:09 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4787",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"35bb58ea6580280b6a83aa24dfff4eeb\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EAB8:78ED:342E99F:3E4E706:5D9BA410",
-      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=2>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\""
-    }
-  },
-  "uuid": "9f7b75e8-6027-4a8d-adc7-2a75326dcd86",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3.json
new file mode 100644
index 0000000000..0953e2b4b3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositories/mappings/users_kohsuke_repos-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "9f7b75e8-6027-4a8d-adc7-2a75326dcd86",
+  "name": "users_kohsuke_repos",
+  "request": {
+    "url": "/users/kohsuke/repos?per_page=30",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke_repos-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:09 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4787",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"35bb58ea6580280b6a83aa24dfff4eeb\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EAB8:78ED:342E99F:3E4E706:5D9BA410",
+      "Link": "<https://api.github.com/user/50003/repos?per_page=30&page=2>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=30&page=9>; rel=\"last\""
+    }
+  },
+  "uuid": "9f7b75e8-6027-4a8d-adc7-2a75326dcd86",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user-e8077934-1fa6-4421-9f2a-a4b7bde4c1a8.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user-e8077934-1fa6-4421-9f2a-a4b7bde4c1a8.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user_50003_repos-c1c1b703-78f4-4000-9759-cab99596d17b.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user_50003_repos-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user_50003_repos-c1c1b703-78f4-4000-9759-cab99596d17b.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/user_50003_repos-4.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke-f1828d0f-f817-49cf-9922-4d64c283688e.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke-f1828d0f-f817-49cf-9922-4d64c283688e.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke_repos-24db0a2f-2ce8-469e-9bb6-232c10fb4fd7.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke_repos-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke_repos-24db0a2f-2ce8-469e-9bb6-232c10fb4fd7.json
rename to src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/__files/users_kohsuke_repos-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1-e80779.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1-e80779.json
deleted file mode 100644
index 925f7e8ab7..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1-e80779.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e8077934-1fa6-4421-9f2a-a4b7bde4c1a8",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-e8077934-1fa6-4421-9f2a-a4b7bde4c1a8.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4783",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EABD:9578:279C4A4:2F6B956:5D9BA413"
-    }
-  },
-  "uuid": "e8077934-1fa6-4421-9f2a-a4b7bde4c1a8",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1.json
new file mode 100644
index 0000000000..d818db2276
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "e8077934-1fa6-4421-9f2a-a4b7bde4c1a8",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4783",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EABD:9578:279C4A4:2F6B956:5D9BA413"
+    }
+  },
+  "uuid": "e8077934-1fa6-4421-9f2a-a4b7bde4c1a8",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4-c1c1b7.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4-c1c1b7.json
deleted file mode 100644
index 94cad7fe1c..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4-c1c1b7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c1c1b703-78f4-4000-9759-cab99596d17b",
-  "name": "user_50003_repos",
-  "request": {
-    "url": "/user/50003/repos?per_page=62&page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user_50003_repos-c1c1b703-78f4-4000-9759-cab99596d17b.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4779",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8e68deca27b0fcbd523cd5cd2254658c\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EABD:9578:279C561:2F6BA33:5D9BA415",
-      "Link": "<https://api.github.com/user/50003/repos?per_page=62&page=1>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=62&page=3>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=62&page=5>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=62&page=1>; rel=\"first\""
-    }
-  },
-  "uuid": "c1c1b703-78f4-4000-9759-cab99596d17b",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4.json
new file mode 100644
index 0000000000..a68f5afc17
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/user_50003_repos-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "c1c1b703-78f4-4000-9759-cab99596d17b",
+  "name": "user_50003_repos",
+  "request": {
+    "url": "/user/50003/repos?per_page=62&page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user_50003_repos-4.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4779",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8e68deca27b0fcbd523cd5cd2254658c\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EABD:9578:279C561:2F6BA33:5D9BA415",
+      "Link": "<https://api.github.com/user/50003/repos?per_page=62&page=1>; rel=\"prev\", <https://api.github.com/user/50003/repos?per_page=62&page=3>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=62&page=5>; rel=\"last\", <https://api.github.com/user/50003/repos?per_page=62&page=1>; rel=\"first\""
+    }
+  },
+  "uuid": "c1c1b703-78f4-4000-9759-cab99596d17b",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2-f1828d.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2-f1828d.json
deleted file mode 100644
index 3b50bc64e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2-f1828d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "f1828d0f-f817-49cf-9922-4d64c283688e",
-  "name": "users_kohsuke",
-  "request": {
-    "url": "/users/kohsuke",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke-f1828d0f-f817-49cf-9922-4d64c283688e.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4781",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"03bc56e9984bf18e3f1d56c2a48227a4\"",
-      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EABD:9578:279C4C7:2F6B96F:5D9BA414"
-    }
-  },
-  "uuid": "f1828d0f-f817-49cf-9922-4d64c283688e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2.json
new file mode 100644
index 0000000000..74f3264e64
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "f1828d0f-f817-49cf-9922-4d64c283688e",
+  "name": "users_kohsuke",
+  "request": {
+    "url": "/users/kohsuke",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4781",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"03bc56e9984bf18e3f1d56c2a48227a4\"",
+      "Last-Modified": "Wed, 02 Oct 2019 19:54:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EABD:9578:279C4C7:2F6B96F:5D9BA414"
+    }
+  },
+  "uuid": "f1828d0f-f817-49cf-9922-4d64c283688e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3-24db0a.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3-24db0a.json
deleted file mode 100644
index f59555bb6b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3-24db0a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "24db0a2f-2ce8-469e-9bb6-232c10fb4fd7",
-  "name": "users_kohsuke_repos",
-  "request": {
-    "url": "/users/kohsuke/repos?per_page=62",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_kohsuke_repos-24db0a2f-2ce8-469e-9bb6-232c10fb4fd7.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:46:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4780",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"95afd8d4418a307225635c52d4bd5109\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EABD:9578:279C4DB:2F6B998:5D9BA414",
-      "Link": "<https://api.github.com/user/50003/repos?per_page=62&page=2>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=62&page=5>; rel=\"last\""
-    }
-  },
-  "uuid": "24db0a2f-2ce8-469e-9bb6-232c10fb4fd7",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3.json b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3.json
new file mode 100644
index 0000000000..023770408b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/listPublicRepositoriesPageSize62/mappings/users_kohsuke_repos-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "24db0a2f-2ce8-469e-9bb6-232c10fb4fd7",
+  "name": "users_kohsuke_repos",
+  "request": {
+    "url": "/users/kohsuke/repos?per_page=62",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_kohsuke_repos-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:46:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4780",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"95afd8d4418a307225635c52d4bd5109\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EABD:9578:279C4DB:2F6B998:5D9BA414",
+      "Link": "<https://api.github.com/user/50003/repos?per_page=62&page=2>; rel=\"next\", <https://api.github.com/user/50003/repos?per_page=62&page=5>; rel=\"last\""
+    }
+  },
+  "uuid": "24db0a2f-2ce8-469e-9bb6-232c10fb4fd7",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3-d76abe.json
deleted file mode 100644
index 0275d999d0..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f09",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json
new file mode 100644
index 0000000000..d34d59e141
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f09",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f09-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testBadEmail/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3-d76abe.json
deleted file mode 100644
index e97185d616..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f01",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json
new file mode 100644
index 0000000000..7eb88033b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f01",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f01-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testExpiredKey/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3-d76abe.json
deleted file mode 100644
index b80e5abe3e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f03",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json
new file mode 100644
index 0000000000..40d4891ba0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f03",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f03-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyError/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3-d76abe.json
deleted file mode 100644
index a58c263fbe..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f04",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json
new file mode 100644
index 0000000000..005ab2b4f4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f04",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f04-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testGpgverifyUnavailable/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3-d76abe.json
deleted file mode 100644
index fa9c2040eb..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f12",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json
new file mode 100644
index 0000000000..873e94d8e9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f12",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f12-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testInvalid/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3-d76abe.json
deleted file mode 100644
index abfc25f575..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f11",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json
new file mode 100644
index 0000000000..3a008734b2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f11",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f11-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testMalformedSignature/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3-d76abe.json
deleted file mode 100644
index bf3bdab90e..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f07",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json
new file mode 100644
index 0000000000..219840d587
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f07",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f07-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNoUser/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3-d76abe.json
deleted file mode 100644
index 7052729f51..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f02",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json
new file mode 100644
index 0000000000..0e3621ecd4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f02",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f02-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testNotSigningKey/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3-d76abe.json
deleted file mode 100644
index 14cd54d00b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f10",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json
new file mode 100644
index 0000000000..7566330ce0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f10",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f10-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownKey/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3-d76abe.json
deleted file mode 100644
index b6be54d99d..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f06",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json
new file mode 100644
index 0000000000..90a8f2e83d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f06",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f06-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnknownSignatureType/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3-d76abe.json
deleted file mode 100644
index 2c8cf2b152..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f05",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json
new file mode 100644
index 0000000000..51e88aefaf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f05",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f05-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnsigned/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3-d76abe.json
deleted file mode 100644
index 9da20c610b..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f08",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json
new file mode 100644
index 0000000000..b6f44803fa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f08",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f08-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testUnverifiedEmail/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-d76abea9-c1be-430a-bbd0-28931c58e1e8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-d76abea9-c1be-430a-bbd0-28931c58e1e8.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json
rename to src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2-441cdf.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2-441cdf.json
deleted file mode 100644
index cc1479b9e1..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2-441cdf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-441cdfd7-a44a-42b4-b732-57e674227760.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4295",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
-      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
-    }
-  },
-  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..5238b99a8b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4295",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c1a01d01a6354d93b3cc6098e0b2d047\"",
+      "Last-Modified": "Fri, 25 Oct 2019 01:32:16 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B56:C4A050:5DB3A147"
+    }
+  },
+  "uuid": "441cdfd7-a44a-42b4-b732-57e674227760",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3-d76abe.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3-d76abe.json
deleted file mode 100644
index 8743a6bded..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3-d76abe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13",
-  "request": {
-    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f13",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-d76abea9-c1be-430a-bbd0-28931c58e1e8.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4294",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
-      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
-    }
-  },
-  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json
new file mode 100644
index 0000000000..4738e5a3ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "name": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13",
+  "request": {
+    "url": "/repos/github-api/github-api/commits/86a2e245aa6d71d54923655066049d9e21a15f13",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_commits_86a2e245aa6d71d54923655066049d9e21a15f13-3.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4294",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0a8c453e4290ce879ea09578e06a5961\"",
+      "Last-Modified": "Mon, 19 Apr 2010 04:12:41 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B5F:C4A064:5DB3A148"
+    }
+  },
+  "uuid": "d76abea9-c1be-430a-bbd0-28931c58e1e8",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1-c247f8.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1-c247f8.json
deleted file mode 100644
index 47e2ab0507..0000000000
--- a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1-c247f8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c247f81b-84b8-44e9-820a-0a91dc74ce98.json",
-    "headers": {
-      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4297",
-      "X-RateLimit-Reset": "1572055286",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
-    }
-  },
-  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1.json
new file mode 100644
index 0000000000..d170c6a506
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHVerificationReasonTest/wiremock/testValid/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 26 Oct 2019 01:28:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4297",
+      "X-RateLimit-Reset": "1572055286",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8c3d3dcf6fc5f9edaf26c902295396e5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CB01:05A2:A65B49:C4A046:5DB3A147"
+    }
+  },
+  "uuid": "c247f81b-84b8-44e9-820a-0a91dc74ce98",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/__files/-2ce6df61-378a-43bd-9d37-d0851f8699bf.json b/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/__files/-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/__files/-2ce6df61-378a-43bd-9d37-d0851f8699bf.json
rename to src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/__files/-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1-2ce6df.json b/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1-2ce6df.json
deleted file mode 100644
index 19a8e7bfcb..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1-2ce6df.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "2ce6df61-378a-43bd-9d37-d0851f8699bf",
-  "name": "",
-  "request": {
-    "url": "/",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "-2ce6df61-378a-43bd-9d37-d0851f8699bf.json",
-    "headers": {
-      "Date": "Wed, 26 Feb 2020 03:55:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "58",
-      "X-RateLimit-Reset": "1582692906",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"323592c0d9feaab7a8e4a4e2a555feec\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EE6F:3AF2:5C10D:6DDAD:5E55EC35"
-    }
-  },
-  "uuid": "2ce6df61-378a-43bd-9d37-d0851f8699bf",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1.json b/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1.json
new file mode 100644
index 0000000000..d78254c96b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubConnectionTest/wiremock/testGitHubIsApiUrlValid/mappings/-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "2ce6df61-378a-43bd-9d37-d0851f8699bf",
+  "name": "",
+  "request": {
+    "url": "/",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "-1.json",
+    "headers": {
+      "Date": "Wed, 26 Feb 2020 03:55:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "58",
+      "X-RateLimit-Reset": "1582692906",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"323592c0d9feaab7a8e4a4e2a555feec\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EE6F:3AF2:5C10D:6DDAD:5E55EC35"
+    }
+  },
+  "uuid": "2ce6df61-378a-43bd-9d37-d0851f8699bf",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/__files/meta-d7546658-0019-4aac-ad1a-502d7abd8050.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/__files/meta-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/__files/meta-d7546658-0019-4aac-ad1a-502d7abd8050.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/__files/meta-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1-d75466.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1-d75466.json
deleted file mode 100644
index 12ca6c8812..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1-d75466.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "d7546658-0019-4aac-ad1a-502d7abd8050",
-  "name": "meta",
-  "request": {
-    "url": "/meta",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "meta-d7546658-0019-4aac-ad1a-502d7abd8050.json",
-    "headers": {
-      "Date": "Thu, 14 Nov 2019 02:46:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "59",
-      "X-RateLimit-Reset": "1573703174",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"eb00a8c05920e4cb21eb0d018c339fe1\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FC2E:3B7E:AD9E9:C9032:5DCCBFF6"
-    }
-  },
-  "uuid": "d7546658-0019-4aac-ad1a-502d7abd8050",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1.json
new file mode 100644
index 0000000000..2972e1d530
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMeta/mappings/meta-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "d7546658-0019-4aac-ad1a-502d7abd8050",
+  "name": "meta",
+  "request": {
+    "url": "/meta",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "meta-1.json",
+    "headers": {
+      "Date": "Thu, 14 Nov 2019 02:46:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "59",
+      "X-RateLimit-Reset": "1573703174",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"eb00a8c05920e4cb21eb0d018c339fe1\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FC2E:3B7E:AD9E9:C9032:5DCCBFF6"
+    }
+  },
+  "uuid": "d7546658-0019-4aac-ad1a-502d7abd8050",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/mappings/mapping-user-marketplace_purchases-stubbed-eVWvD.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/mappings/mapping-user-marketplace_purchases-stubbed-eVWvD.json
index 34e373f314..ce6e51d032 100644
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/mappings/mapping-user-marketplace_purchases-stubbed-eVWvD.json
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getMyMarketplacePurchases/mappings/mapping-user-marketplace_purchases-stubbed-eVWvD.json
@@ -1,42 +1,45 @@
 {
-  "id" : "e5392532-debb-30c4-b86b-f5882a0d22b6",
-  "request" : {
-    "url" : "/user/marketplace_purchases",
-    "method" : "GET",
+  "id": "e5392532-debb-30c4-b86b-f5882a0d22b6",
+  "request": {
+    "url": "/user/marketplace_purchases",
+    "method": "GET",
     "headers": {
       "Accept": {
         "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
       }
     }
   },
-  "response" : {
-    "status" : 200,
-    "bodyFileName" : "body-user-marketplace_purchases-stubbed-eVWvD.json",
-    "headers" : {
-      "Date" : "Mon, 09 Dec 2019 09:18:08 GMT",
-      "Content-Type" : "application/json; charset=utf-8",
-      "Transfer-Encoding" : "chunked",
-      "Server" : "GitHub.com",
-      "Status" : "200 OK",
-      "X-RateLimit-Limit" : "5000",
-      "X-RateLimit-Remaining" : "4992",
-      "X-RateLimit-Reset" : "1575886580",
-      "Cache-Control" : "private, max-age=60, s-maxage=60",
-      "Vary" : [ "Accept, Authorization, Cookie, X-GitHub-OTP", "Accept-Encoding" ],
-      "ETag" : "W/\"696016ae26c2d9b5700cdfb0b3d43f4f\"",
-      "X-OAuth-Scopes" : "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
-      "X-Accepted-OAuth-Scopes" : "",
-      "X-GitHub-Media-Type" : "unknown, github.v3",
-      "Access-Control-Expose-Headers" : "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin" : "*",
-      "Strict-Transport-Security" : "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options" : "deny",
-      "X-Content-Type-Options" : "nosniff",
-      "X-XSS-Protection" : "1; mode=block",
-      "Referrer-Policy" : "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy" : "default-src 'none'",
-      "X-GitHub-Request-Id" : "F2B3:2956:2256FFE:2717BE8:5DEE114F"
+  "response": {
+    "status": 200,
+    "bodyFileName": "body-user-marketplace_purchases-stubbed-eVWvD.json",
+    "headers": {
+      "Date": "Mon, 09 Dec 2019 09:18:08 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Transfer-Encoding": "chunked",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1575886580",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"696016ae26c2d9b5700cdfb0b3d43f4f\"",
+      "X-OAuth-Scopes": "admin:enterprise, admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete:packages, delete_repo, gist, notifications, read:packages, repo, user, workflow, write:discussion, write:packages",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F2B3:2956:2256FFE:2717BE8:5DEE114F"
     }
   },
-  "uuid" : "e5392532-debb-30c4-b86b-f5882a0d22b6"
+  "uuid": "e5392532-debb-30c4-b86b-f5882a0d22b6"
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-0fccda9a-fb5c-4db2-9990-09b3cb4f74bd.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-0fccda9a-fb5c-4db2-9990-09b3cb4f74bd.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-11.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-003debd0-3deb-41e2-a5ad-b1bdb02b270a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-003debd0-3deb-41e2-a5ad-b1bdb02b270a.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-14.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-025896c9-23c5-4051-b363-eb2e59c0c90a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-025896c9-23c5-4051-b363-eb2e59c0c90a.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-2.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-4ef81065-9209-4a61-80c4-9f4dd64508ac.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-4ef81065-9209-4a61-80c4-9f4dd64508ac.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-5.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-19d13a8c-7b2a-4dbb-a0fb-e69ecb693956.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-19d13a8c-7b2a-4dbb-a0fb-e69ecb693956.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/organizations-8.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_collectiveidea-4bbf97a8-2c8d-4c25-a7e4-208719659507.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_collectiveidea-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_collectiveidea-4bbf97a8-2c8d-4c25-a7e4-208719659507.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_collectiveidea-7.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_engineyard-643eb559-d752-4906-861b-4cfe1723286f.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_engineyard-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_engineyard-643eb559-d752-4906-861b-4cfe1723286f.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_engineyard-4.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_entryway-e1bd91f3-b63b-4fed-bb85-3da264635250.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_entryway-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_entryway-e1bd91f3-b63b-4fed-bb85-3da264635250.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_entryway-12.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_errfree-63eb86fa-54a5-4115-bdda-1804f5db66af.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_errfree-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_errfree-63eb86fa-54a5-4115-bdda-1804f5db66af.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_errfree-3.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_merb-df20cca6-38fd-45f8-9784-0aaec71bbb8a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_merb-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_merb-df20cca6-38fd-45f8-9784-0aaec71bbb8a.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_merb-13.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ministrycentered-40a544eb-0080-4cff-b543-7acf299f4068.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ministrycentered-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ministrycentered-40a544eb-0080-4cff-b543-7acf299f4068.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ministrycentered-6.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_moneyspyder-859aaf3c-8049-4341-9984-6360921b5bb3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_moneyspyder-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_moneyspyder-859aaf3c-8049-4341-9984-6360921b5bb3.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_moneyspyder-15.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ogc-7ba44dcd-146a-427c-b2cb-ff6291d00223.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ogc-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ogc-7ba44dcd-146a-427c-b2cb-ff6291d00223.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_ogc-9.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sevenwire-2a01f699-874a-4526-877d-e15644e401c7.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sevenwire-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sevenwire-2a01f699-874a-4526-877d-e15644e401c7.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sevenwire-10.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sproutit-a165deae-7ede-4c89-aab5-5d36e5b0513a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sproutit-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sproutit-a165deae-7ede-4c89-aab5-5d36e5b0513a.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/orgs_sproutit-16.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/user-d7829e63-d5dc-4d25-846d-7d1e2dd2500e.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/user-d7829e63-d5dc-4d25-846d-7d1e2dd2500e.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11-0fccda.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11-0fccda.json
deleted file mode 100644
index 672da96103..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11-0fccda.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "0fccda9a-fb5c-4db2-9990-09b3cb4f74bd",
-  "name": "organizations",
-  "request": {
-    "url": "/organizations?per_page=2&since=150",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations-0fccda9a-fb5c-4db2-9990-09b3cb4f74bd.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4923",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26de171d937063377024b4696eff5825\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:3390056:3D8FAF7:5D9B916F",
-      "Link": "<https://api.github.com/organizations?per_page=2&since=264>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "0fccda9a-fb5c-4db2-9990-09b3cb4f74bd",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11.json
new file mode 100644
index 0000000000..63ea10b2ff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "0fccda9a-fb5c-4db2-9990-09b3cb4f74bd",
+  "name": "organizations",
+  "request": {
+    "url": "/organizations?per_page=2&since=150",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations-11.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4923",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26de171d937063377024b4696eff5825\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:3390056:3D8FAF7:5D9B916F",
+      "Link": "<https://api.github.com/organizations?per_page=2&since=264>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "0fccda9a-fb5c-4db2-9990-09b3cb4f74bd",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14-003deb.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14-003deb.json
deleted file mode 100644
index 9f0ff925e8..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14-003deb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "003debd0-3deb-41e2-a5ad-b1bdb02b270a",
-  "name": "organizations",
-  "request": {
-    "url": "/organizations?per_page=2&since=264",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations-003debd0-3deb-41e2-a5ad-b1bdb02b270a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4920",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dfcafc568f1006761b09867ef3e07aef\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:3390072:3D8FB1A:5D9B9170",
-      "Link": "<https://api.github.com/organizations?per_page=2&since=374>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "003debd0-3deb-41e2-a5ad-b1bdb02b270a",
-  "persistent": true,
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14.json
new file mode 100644
index 0000000000..e77817969c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-14.json
@@ -0,0 +1,48 @@
+{
+  "id": "003debd0-3deb-41e2-a5ad-b1bdb02b270a",
+  "name": "organizations",
+  "request": {
+    "url": "/organizations?per_page=2&since=264",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations-14.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4920",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dfcafc568f1006761b09867ef3e07aef\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:3390072:3D8FB1A:5D9B9170",
+      "Link": "<https://api.github.com/organizations?per_page=2&since=374>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "003debd0-3deb-41e2-a5ad-b1bdb02b270a",
+  "persistent": true,
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2-025896.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2-025896.json
deleted file mode 100644
index 291d4d5892..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2-025896.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "025896c9-23c5-4051-b363-eb2e59c0c90a",
-  "name": "organizations",
-  "request": {
-    "url": "/organizations?per_page=2",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations-025896c9-23c5-4051-b363-eb2e59c0c90a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4932",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c037a5f442a94f750d923c61d9391a19\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:338FFD8:3D8FA5F:5D9B916E",
-      "Link": "<https://api.github.com/organizations?per_page=2&since=81>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "025896c9-23c5-4051-b363-eb2e59c0c90a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2.json
new file mode 100644
index 0000000000..c5eaab6b4b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "025896c9-23c5-4051-b363-eb2e59c0c90a",
+  "name": "organizations",
+  "request": {
+    "url": "/organizations?per_page=2",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c037a5f442a94f750d923c61d9391a19\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:338FFD8:3D8FA5F:5D9B916E",
+      "Link": "<https://api.github.com/organizations?per_page=2&since=81>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "025896c9-23c5-4051-b363-eb2e59c0c90a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5-4ef810.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5-4ef810.json
deleted file mode 100644
index d1ffdad190..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5-4ef810.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4ef81065-9209-4a61-80c4-9f4dd64508ac",
-  "name": "organizations",
-  "request": {
-    "url": "/organizations?per_page=2&since=81",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations-4ef81065-9209-4a61-80c4-9f4dd64508ac.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4929",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"864e236742b154eba004ea36d6980204\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:338FFFC:3D8FA93:5D9B916F",
-      "Link": "<https://api.github.com/organizations?per_page=2&since=128>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "4ef81065-9209-4a61-80c4-9f4dd64508ac",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5.json
new file mode 100644
index 0000000000..085a888cfe
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "4ef81065-9209-4a61-80c4-9f4dd64508ac",
+  "name": "organizations",
+  "request": {
+    "url": "/organizations?per_page=2&since=81",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations-5.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4929",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"864e236742b154eba004ea36d6980204\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:338FFFC:3D8FA93:5D9B916F",
+      "Link": "<https://api.github.com/organizations?per_page=2&since=128>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "4ef81065-9209-4a61-80c4-9f4dd64508ac",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8-19d13a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8-19d13a.json
deleted file mode 100644
index 54682ee8ec..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8-19d13a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "19d13a8c-7b2a-4dbb-a0fb-e69ecb693956",
-  "name": "organizations",
-  "request": {
-    "url": "/organizations?per_page=2&since=128",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "organizations-19d13a8c-7b2a-4dbb-a0fb-e69ecb693956.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4926",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a904bd8ead437e80f8b69aafc761a060\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:339002D:3D8FAC8:5D9B916F",
-      "Link": "<https://api.github.com/organizations?per_page=2&since=150>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "19d13a8c-7b2a-4dbb-a0fb-e69ecb693956",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8.json
new file mode 100644
index 0000000000..1f16f1257e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/organizations-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "19d13a8c-7b2a-4dbb-a0fb-e69ecb693956",
+  "name": "organizations",
+  "request": {
+    "url": "/organizations?per_page=2&since=128",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations-8.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4926",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a904bd8ead437e80f8b69aafc761a060\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:339002D:3D8FAC8:5D9B916F",
+      "Link": "<https://api.github.com/organizations?per_page=2&since=150>; rel=\"next\", <https://api.github.com/organizations{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "19d13a8c-7b2a-4dbb-a0fb-e69ecb693956",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7-4bbf97.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7-4bbf97.json
deleted file mode 100644
index 02984e178e..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7-4bbf97.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "4bbf97a8-2c8d-4c25-a7e4-208719659507",
-  "name": "orgs_collectiveidea",
-  "request": {
-    "url": "/orgs/collectiveidea",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_collectiveidea-4bbf97a8-2c8d-4c25-a7e4-208719659507.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4927",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9c98bd97d1923ee0226ad3560e207d6e\"",
-      "Last-Modified": "Wed, 05 Jun 2019 00:07:11 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:339001A:3D8FAB4:5D9B916F"
-    }
-  },
-  "uuid": "4bbf97a8-2c8d-4c25-a7e4-208719659507",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7.json
new file mode 100644
index 0000000000..fdd3d4886e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_collectiveidea-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "4bbf97a8-2c8d-4c25-a7e4-208719659507",
+  "name": "orgs_collectiveidea",
+  "request": {
+    "url": "/orgs/collectiveidea",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_collectiveidea-7.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4927",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9c98bd97d1923ee0226ad3560e207d6e\"",
+      "Last-Modified": "Wed, 05 Jun 2019 00:07:11 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:339001A:3D8FAB4:5D9B916F"
+    }
+  },
+  "uuid": "4bbf97a8-2c8d-4c25-a7e4-208719659507",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4-643eb5.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4-643eb5.json
deleted file mode 100644
index 41a68fef62..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4-643eb5.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "643eb559-d752-4906-861b-4cfe1723286f",
-  "name": "orgs_engineyard",
-  "request": {
-    "url": "/orgs/engineyard",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_engineyard-643eb559-d752-4906-861b-4cfe1723286f.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"11d8f6e17794aa240cbaf4487b9dcd87\"",
-      "Last-Modified": "Wed, 05 Jun 2019 00:06:15 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:338FFEF:3D8FA82:5D9B916E"
-    }
-  },
-  "uuid": "643eb559-d752-4906-861b-4cfe1723286f",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4.json
new file mode 100644
index 0000000000..e2d7ffe42a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_engineyard-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "643eb559-d752-4906-861b-4cfe1723286f",
+  "name": "orgs_engineyard",
+  "request": {
+    "url": "/orgs/engineyard",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_engineyard-4.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"11d8f6e17794aa240cbaf4487b9dcd87\"",
+      "Last-Modified": "Wed, 05 Jun 2019 00:06:15 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:338FFEF:3D8FA82:5D9B916E"
+    }
+  },
+  "uuid": "643eb559-d752-4906-861b-4cfe1723286f",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12-e1bd91.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12-e1bd91.json
deleted file mode 100644
index 5374a36551..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12-e1bd91.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "e1bd91f3-b63b-4fed-bb85-3da264635250",
-  "name": "orgs_entryway",
-  "request": {
-    "url": "/orgs/entryway",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_entryway-e1bd91f3-b63b-4fed-bb85-3da264635250.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4d76e7290b712893b68b5d3e96545504\"",
-      "Last-Modified": "Wed, 05 Jun 2019 00:11:06 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:339005F:3D8FB01:5D9B916F"
-    }
-  },
-  "uuid": "e1bd91f3-b63b-4fed-bb85-3da264635250",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12.json
new file mode 100644
index 0000000000..24d5546b4f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_entryway-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "e1bd91f3-b63b-4fed-bb85-3da264635250",
+  "name": "orgs_entryway",
+  "request": {
+    "url": "/orgs/entryway",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_entryway-12.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4d76e7290b712893b68b5d3e96545504\"",
+      "Last-Modified": "Wed, 05 Jun 2019 00:11:06 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:339005F:3D8FB01:5D9B916F"
+    }
+  },
+  "uuid": "e1bd91f3-b63b-4fed-bb85-3da264635250",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3-63eb86.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3-63eb86.json
deleted file mode 100644
index 7d6167fa7d..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3-63eb86.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "63eb86fa-54a5-4115-bdda-1804f5db66af",
-  "name": "orgs_errfree",
-  "request": {
-    "url": "/orgs/errfree",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_errfree-63eb86fa-54a5-4115-bdda-1804f5db66af.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4931",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"14ed7bbac6fe0062ee6be6fbe7b873a9\"",
-      "Last-Modified": "Wed, 05 Jun 2019 00:06:09 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:338FFDF:3D8FA6D:5D9B916E"
-    }
-  },
-  "uuid": "63eb86fa-54a5-4115-bdda-1804f5db66af",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3.json
new file mode 100644
index 0000000000..0c65ad1ba8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_errfree-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "63eb86fa-54a5-4115-bdda-1804f5db66af",
+  "name": "orgs_errfree",
+  "request": {
+    "url": "/orgs/errfree",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_errfree-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"14ed7bbac6fe0062ee6be6fbe7b873a9\"",
+      "Last-Modified": "Wed, 05 Jun 2019 00:06:09 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:338FFDF:3D8FA6D:5D9B916E"
+    }
+  },
+  "uuid": "63eb86fa-54a5-4115-bdda-1804f5db66af",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13-df20cc.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13-df20cc.json
deleted file mode 100644
index 05850c02c9..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13-df20cc.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "df20cca6-38fd-45f8-9784-0aaec71bbb8a",
-  "name": "orgs_merb",
-  "request": {
-    "url": "/orgs/merb",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_merb-df20cca6-38fd-45f8-9784-0aaec71bbb8a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4921",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"52aed66b9cb6e2c96a896360166c2b13\"",
-      "Last-Modified": "Mon, 03 Jun 2019 21:15:07 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:3390066:3D8FB0A:5D9B9170"
-    }
-  },
-  "uuid": "df20cca6-38fd-45f8-9784-0aaec71bbb8a",
-  "persistent": true,
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13.json
new file mode 100644
index 0000000000..40e342f5ff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_merb-13.json
@@ -0,0 +1,48 @@
+{
+  "id": "df20cca6-38fd-45f8-9784-0aaec71bbb8a",
+  "name": "orgs_merb",
+  "request": {
+    "url": "/orgs/merb",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_merb-13.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4921",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"52aed66b9cb6e2c96a896360166c2b13\"",
+      "Last-Modified": "Mon, 03 Jun 2019 21:15:07 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:3390066:3D8FB0A:5D9B9170"
+    }
+  },
+  "uuid": "df20cca6-38fd-45f8-9784-0aaec71bbb8a",
+  "persistent": true,
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6-40a544.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6-40a544.json
deleted file mode 100644
index 46a9b9f3b0..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6-40a544.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "40a544eb-0080-4cff-b543-7acf299f4068",
-  "name": "orgs_ministrycentered",
-  "request": {
-    "url": "/orgs/ministrycentered",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_ministrycentered-40a544eb-0080-4cff-b543-7acf299f4068.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4928",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d8d62bd0ad5b457ad3e0f612e56d239d\"",
-      "Last-Modified": "Tue, 30 Jul 2019 22:28:36 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:339000B:3D8FAA0:5D9B916F"
-    }
-  },
-  "uuid": "40a544eb-0080-4cff-b543-7acf299f4068",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6.json
new file mode 100644
index 0000000000..494da619ac
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ministrycentered-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "40a544eb-0080-4cff-b543-7acf299f4068",
+  "name": "orgs_ministrycentered",
+  "request": {
+    "url": "/orgs/ministrycentered",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_ministrycentered-6.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4928",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d8d62bd0ad5b457ad3e0f612e56d239d\"",
+      "Last-Modified": "Tue, 30 Jul 2019 22:28:36 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:339000B:3D8FAA0:5D9B916F"
+    }
+  },
+  "uuid": "40a544eb-0080-4cff-b543-7acf299f4068",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15-859aaf.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15-859aaf.json
deleted file mode 100644
index 4d05a24f7b..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15-859aaf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "859aaf3c-8049-4341-9984-6360921b5bb3",
-  "name": "orgs_moneyspyder",
-  "request": {
-    "url": "/orgs/moneyspyder",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_moneyspyder-859aaf3c-8049-4341-9984-6360921b5bb3.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4919",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7186eacccf626d86599d3fb7323139ae\"",
-      "Last-Modified": "Tue, 25 Jun 2019 13:02:14 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:3390082:3D8FB2A:5D9B9170"
-    }
-  },
-  "uuid": "859aaf3c-8049-4341-9984-6360921b5bb3",
-  "persistent": true,
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15.json
new file mode 100644
index 0000000000..dcacf6648e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_moneyspyder-15.json
@@ -0,0 +1,48 @@
+{
+  "id": "859aaf3c-8049-4341-9984-6360921b5bb3",
+  "name": "orgs_moneyspyder",
+  "request": {
+    "url": "/orgs/moneyspyder",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_moneyspyder-15.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7186eacccf626d86599d3fb7323139ae\"",
+      "Last-Modified": "Tue, 25 Jun 2019 13:02:14 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:3390082:3D8FB2A:5D9B9170"
+    }
+  },
+  "uuid": "859aaf3c-8049-4341-9984-6360921b5bb3",
+  "persistent": true,
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9-7ba44d.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9-7ba44d.json
deleted file mode 100644
index 262d18078d..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9-7ba44d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7ba44dcd-146a-427c-b2cb-ff6291d00223",
-  "name": "orgs_ogc",
-  "request": {
-    "url": "/orgs/ogc",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_ogc-7ba44dcd-146a-427c-b2cb-ff6291d00223.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4925",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b08ebb3b005a2676b9a14f2d3b2396a7\"",
-      "Last-Modified": "Wed, 05 Jun 2019 00:07:35 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:3390038:3D8FAD8:5D9B916F"
-    }
-  },
-  "uuid": "7ba44dcd-146a-427c-b2cb-ff6291d00223",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9.json
new file mode 100644
index 0000000000..ad25d33214
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_ogc-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "7ba44dcd-146a-427c-b2cb-ff6291d00223",
+  "name": "orgs_ogc",
+  "request": {
+    "url": "/orgs/ogc",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_ogc-9.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4925",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b08ebb3b005a2676b9a14f2d3b2396a7\"",
+      "Last-Modified": "Wed, 05 Jun 2019 00:07:35 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:3390038:3D8FAD8:5D9B916F"
+    }
+  },
+  "uuid": "7ba44dcd-146a-427c-b2cb-ff6291d00223",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10-2a01f6.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10-2a01f6.json
deleted file mode 100644
index eaea1527f0..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10-2a01f6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2a01f699-874a-4526-877d-e15644e401c7",
-  "name": "orgs_sevenwire",
-  "request": {
-    "url": "/orgs/sevenwire",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_sevenwire-2a01f699-874a-4526-877d-e15644e401c7.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4924",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d219d14a4efd0773d709798ab3990eff\"",
-      "Last-Modified": "Wed, 05 Jun 2019 00:07:48 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:3390045:3D8FAE6:5D9B916F"
-    }
-  },
-  "uuid": "2a01f699-874a-4526-877d-e15644e401c7",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10.json
new file mode 100644
index 0000000000..d666f3d15d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sevenwire-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "2a01f699-874a-4526-877d-e15644e401c7",
+  "name": "orgs_sevenwire",
+  "request": {
+    "url": "/orgs/sevenwire",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_sevenwire-10.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4924",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d219d14a4efd0773d709798ab3990eff\"",
+      "Last-Modified": "Wed, 05 Jun 2019 00:07:48 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:3390045:3D8FAE6:5D9B916F"
+    }
+  },
+  "uuid": "2a01f699-874a-4526-877d-e15644e401c7",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16-a165de.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16-a165de.json
deleted file mode 100644
index 6ea4bc5fa8..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16-a165de.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a165deae-7ede-4c89-aab5-5d36e5b0513a",
-  "name": "orgs_sproutit",
-  "request": {
-    "url": "/orgs/sproutit",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_sproutit-a165deae-7ede-4c89-aab5-5d36e5b0513a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4918",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"361016fe216959b5ea98505ff6c579e8\"",
-      "Last-Modified": "Wed, 05 Jun 2019 03:11:59 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:339008A:3D8FB39:5D9B9170"
-    }
-  },
-  "uuid": "a165deae-7ede-4c89-aab5-5d36e5b0513a",
-  "persistent": true,
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16.json
new file mode 100644
index 0000000000..1c113920e9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/orgs_sproutit-16.json
@@ -0,0 +1,48 @@
+{
+  "id": "a165deae-7ede-4c89-aab5-5d36e5b0513a",
+  "name": "orgs_sproutit",
+  "request": {
+    "url": "/orgs/sproutit",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_sproutit-16.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4918",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"361016fe216959b5ea98505ff6c579e8\"",
+      "Last-Modified": "Wed, 05 Jun 2019 03:11:59 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:339008A:3D8FB39:5D9B9170"
+    }
+  },
+  "uuid": "a165deae-7ede-4c89-aab5-5d36e5b0513a",
+  "persistent": true,
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1-d7829e.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1-d7829e.json
deleted file mode 100644
index 018ae294d8..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1-d7829e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d7829e63-d5dc-4d25-846d-7d1e2dd2500e",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d7829e63-d5dc-4d25-846d-7d1e2dd2500e.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4933",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cac42a681d528a42c7d3cb77dc768cad\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E262:78ED:338FFC0:3D8FA45:5D9B916E"
-    }
-  },
-  "uuid": "d7829e63-d5dc-4d25-846d-7d1e2dd2500e",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1.json
new file mode 100644
index 0000000000..506b2a1d0d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/getOrgs/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d7829e63-d5dc-4d25-846d-7d1e2dd2500e",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cac42a681d528a42c7d3cb77dc768cad\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E262:78ED:338FFC0:3D8FA45:5D9B916E"
+    }
+  },
+  "uuid": "d7829e63-d5dc-4d25-846d-7d1e2dd2500e",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/user-83656aeb-e643-451b-a0ee-d8fe7f04e8a1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/user-83656aeb-e643-451b-a0ee-d8fe7f04e8a1.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users-c2940d51-9e34-42a7-9eff-c74efd7221c0.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users-c2940d51-9e34-42a7-9eff-c74efd7221c0.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users-2.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_brynary-87de93ce-da70-4b2b-9fd2-160cb43f69f8.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_brynary-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_brynary-87de93ce-da70-4b2b-9fd2-160cb43f69f8.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_brynary-12.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_defunkt-14f04ed7-4d31-44de-968d-43d1b92eeb42.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_defunkt-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_defunkt-14f04ed7-4d31-44de-968d-43d1b92eeb42.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_defunkt-4.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_evanphx-bb2fea35-b754-47f3-8cc4-eb3a2565fc89.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_evanphx-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_evanphx-bb2fea35-b754-47f3-8cc4-eb3a2565fc89.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_evanphx-9.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ezmobius-2e9ea716-43e7-4062-8359-e8d8946b08e1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ezmobius-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ezmobius-2e9ea716-43e7-4062-8359-e8d8946b08e1.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ezmobius-7.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ivey-2220ec20-6a77-4317-8784-b9dbaea2d27b.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ivey-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ivey-2220ec20-6a77-4317-8784-b9dbaea2d27b.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_ivey-8.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_mojombo-41ed065f-76ae-483d-acd2-363d73c6fc1d.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_mojombo-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_mojombo-41ed065f-76ae-483d-acd2-363d73c6fc1d.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_mojombo-3.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_pjhyett-41b46164-ab52-4908-b424-bcfdf1031af2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_pjhyett-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_pjhyett-41b46164-ab52-4908-b424-bcfdf1031af2.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_pjhyett-5.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_vanpelt-900a0e1a-6b3a-4b29-9f14-d997f1139396.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_vanpelt-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_vanpelt-900a0e1a-6b3a-4b29-9f14-d997f1139396.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_vanpelt-10.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wayneeseguin-3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wayneeseguin-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wayneeseguin-3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wayneeseguin-11.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wycats-b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wycats-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wycats-b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/__files/users_wycats-6.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1-83656a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1-83656a.json
deleted file mode 100644
index 9cecab672f..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1-83656a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "83656aeb-e643-451b-a0ee-d8fe7f04e8a1",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-83656aeb-e643-451b-a0ee-d8fe7f04e8a1.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:29154BF:3118BA5:5D9B916B"
-    }
-  },
-  "uuid": "83656aeb-e643-451b-a0ee-d8fe7f04e8a1",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1.json
new file mode 100644
index 0000000000..5df495b165
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "83656aeb-e643-451b-a0ee-d8fe7f04e8a1",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:29154BF:3118BA5:5D9B916B"
+    }
+  },
+  "uuid": "83656aeb-e643-451b-a0ee-d8fe7f04e8a1",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2-c2940d.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2-c2940d.json
deleted file mode 100644
index accd156cdf..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2-c2940d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c2940d51-9e34-42a7-9eff-c74efd7221c0",
-  "name": "users",
-  "request": {
-    "url": "/users",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users-c2940d51-9e34-42a7-9eff-c74efd7221c0.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:35 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ed0d90e3595bb5ae41087cdbb98c0275\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:29154D8:3118BBD:5D9B916B",
-      "Link": "<https://api.github.com/users?since=46>; rel=\"next\", <https://api.github.com/users{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "c2940d51-9e34-42a7-9eff-c74efd7221c0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2.json
new file mode 100644
index 0000000000..8e388c3bf4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "c2940d51-9e34-42a7-9eff-c74efd7221c0",
+  "name": "users",
+  "request": {
+    "url": "/users",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ed0d90e3595bb5ae41087cdbb98c0275\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:29154D8:3118BBD:5D9B916B",
+      "Link": "<https://api.github.com/users?since=46>; rel=\"next\", <https://api.github.com/users{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "c2940d51-9e34-42a7-9eff-c74efd7221c0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12-87de93.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12-87de93.json
deleted file mode 100644
index 600539b2fd..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12-87de93.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "87de93ce-da70-4b2b-9fd2-160cb43f69f8",
-  "name": "users_brynary",
-  "request": {
-    "url": "/users/brynary",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_brynary-87de93ce-da70-4b2b-9fd2-160cb43f69f8.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4939",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"fb3fed99e6b5139e4444c8a2fe20c973\"",
-      "Last-Modified": "Tue, 27 Aug 2019 18:32:38 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:2915564:3118C63:5D9B916D"
-    }
-  },
-  "uuid": "87de93ce-da70-4b2b-9fd2-160cb43f69f8",
-  "persistent": true,
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12.json
new file mode 100644
index 0000000000..3789f9690d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_brynary-12.json
@@ -0,0 +1,48 @@
+{
+  "id": "87de93ce-da70-4b2b-9fd2-160cb43f69f8",
+  "name": "users_brynary",
+  "request": {
+    "url": "/users/brynary",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_brynary-12.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4939",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fb3fed99e6b5139e4444c8a2fe20c973\"",
+      "Last-Modified": "Tue, 27 Aug 2019 18:32:38 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:2915564:3118C63:5D9B916D"
+    }
+  },
+  "uuid": "87de93ce-da70-4b2b-9fd2-160cb43f69f8",
+  "persistent": true,
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4-14f04e.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4-14f04e.json
deleted file mode 100644
index b856d845f1..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4-14f04e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "14f04ed7-4d31-44de-968d-43d1b92eeb42",
-  "name": "users_defunkt",
-  "request": {
-    "url": "/users/defunkt",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_defunkt-14f04ed7-4d31-44de-968d-43d1b92eeb42.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ccb1bb3a24e2eb4e6b69dc9ffe8bc74\"",
-      "Last-Modified": "Fri, 15 Feb 2019 18:05:47 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:29154FC:3118BED:5D9B916C"
-    }
-  },
-  "uuid": "14f04ed7-4d31-44de-968d-43d1b92eeb42",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4.json
new file mode 100644
index 0000000000..3cd2ed7278
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_defunkt-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "14f04ed7-4d31-44de-968d-43d1b92eeb42",
+  "name": "users_defunkt",
+  "request": {
+    "url": "/users/defunkt",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_defunkt-4.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4947",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ccb1bb3a24e2eb4e6b69dc9ffe8bc74\"",
+      "Last-Modified": "Fri, 15 Feb 2019 18:05:47 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:29154FC:3118BED:5D9B916C"
+    }
+  },
+  "uuid": "14f04ed7-4d31-44de-968d-43d1b92eeb42",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9-bb2fea.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9-bb2fea.json
deleted file mode 100644
index ff8b5c7c7c..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9-bb2fea.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bb2fea35-b754-47f3-8cc4-eb3a2565fc89",
-  "name": "users_evanphx",
-  "request": {
-    "url": "/users/evanphx",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_evanphx-bb2fea35-b754-47f3-8cc4-eb3a2565fc89.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4942",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"6fd4ce951d989b062d252a468631de23\"",
-      "Last-Modified": "Sat, 05 Oct 2019 04:54:19 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:2915543:3118C3C:5D9B916C"
-    }
-  },
-  "uuid": "bb2fea35-b754-47f3-8cc4-eb3a2565fc89",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9.json
new file mode 100644
index 0000000000..6bb61b373d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_evanphx-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "bb2fea35-b754-47f3-8cc4-eb3a2565fc89",
+  "name": "users_evanphx",
+  "request": {
+    "url": "/users/evanphx",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_evanphx-9.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4942",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"6fd4ce951d989b062d252a468631de23\"",
+      "Last-Modified": "Sat, 05 Oct 2019 04:54:19 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:2915543:3118C3C:5D9B916C"
+    }
+  },
+  "uuid": "bb2fea35-b754-47f3-8cc4-eb3a2565fc89",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7-2e9ea7.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7-2e9ea7.json
deleted file mode 100644
index c12e38b776..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7-2e9ea7.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2e9ea716-43e7-4062-8359-e8d8946b08e1",
-  "name": "users_ezmobius",
-  "request": {
-    "url": "/users/ezmobius",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_ezmobius-2e9ea716-43e7-4062-8359-e8d8946b08e1.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4944",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ce58b28ee1a14ec499382d317290b683\"",
-      "Last-Modified": "Mon, 23 Sep 2019 14:26:01 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:2915525:3118C1A:5D9B916C"
-    }
-  },
-  "uuid": "2e9ea716-43e7-4062-8359-e8d8946b08e1",
-  "persistent": true,
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7.json
new file mode 100644
index 0000000000..3335f498a1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ezmobius-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "2e9ea716-43e7-4062-8359-e8d8946b08e1",
+  "name": "users_ezmobius",
+  "request": {
+    "url": "/users/ezmobius",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_ezmobius-7.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4944",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ce58b28ee1a14ec499382d317290b683\"",
+      "Last-Modified": "Mon, 23 Sep 2019 14:26:01 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:2915525:3118C1A:5D9B916C"
+    }
+  },
+  "uuid": "2e9ea716-43e7-4062-8359-e8d8946b08e1",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8-2220ec.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8-2220ec.json
deleted file mode 100644
index 3e6fb83b24..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8-2220ec.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "2220ec20-6a77-4317-8784-b9dbaea2d27b",
-  "name": "users_ivey",
-  "request": {
-    "url": "/users/ivey",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_ivey-2220ec20-6a77-4317-8784-b9dbaea2d27b.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4943",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3799b97a403f61e3ac554d072e29321d\"",
-      "Last-Modified": "Mon, 23 Sep 2019 14:26:01 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:2915532:3118C2B:5D9B916C"
-    }
-  },
-  "uuid": "2220ec20-6a77-4317-8784-b9dbaea2d27b",
-  "persistent": true,
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8.json
new file mode 100644
index 0000000000..cf63212b49
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_ivey-8.json
@@ -0,0 +1,48 @@
+{
+  "id": "2220ec20-6a77-4317-8784-b9dbaea2d27b",
+  "name": "users_ivey",
+  "request": {
+    "url": "/users/ivey",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_ivey-8.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4943",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3799b97a403f61e3ac554d072e29321d\"",
+      "Last-Modified": "Mon, 23 Sep 2019 14:26:01 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:2915532:3118C2B:5D9B916C"
+    }
+  },
+  "uuid": "2220ec20-6a77-4317-8784-b9dbaea2d27b",
+  "persistent": true,
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3-41ed06.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3-41ed06.json
deleted file mode 100644
index ac7b9abd2b..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3-41ed06.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "41ed065f-76ae-483d-acd2-363d73c6fc1d",
-  "name": "users_mojombo",
-  "request": {
-    "url": "/users/mojombo",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_mojombo-41ed065f-76ae-483d-acd2-363d73c6fc1d.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a5edfb24b60db17ec8053aff2e34da64\"",
-      "Last-Modified": "Mon, 19 Aug 2019 19:50:56 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:29154ED:3118BD9:5D9B916B"
-    }
-  },
-  "uuid": "41ed065f-76ae-483d-acd2-363d73c6fc1d",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3.json
new file mode 100644
index 0000000000..3e18d35ceb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_mojombo-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "41ed065f-76ae-483d-acd2-363d73c6fc1d",
+  "name": "users_mojombo",
+  "request": {
+    "url": "/users/mojombo",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_mojombo-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4948",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a5edfb24b60db17ec8053aff2e34da64\"",
+      "Last-Modified": "Mon, 19 Aug 2019 19:50:56 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:29154ED:3118BD9:5D9B916B"
+    }
+  },
+  "uuid": "41ed065f-76ae-483d-acd2-363d73c6fc1d",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5-41b461.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5-41b461.json
deleted file mode 100644
index b38321b643..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5-41b461.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "41b46164-ab52-4908-b424-bcfdf1031af2",
-  "name": "users_pjhyett",
-  "request": {
-    "url": "/users/pjhyett",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_pjhyett-41b46164-ab52-4908-b424-bcfdf1031af2.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a0df33012eb7c9c6b9ac7eb7212e6c6d\"",
-      "Last-Modified": "Thu, 12 Jul 2018 15:25:03 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:291550D:3118BFD:5D9B916C"
-    }
-  },
-  "uuid": "41b46164-ab52-4908-b424-bcfdf1031af2",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5.json
new file mode 100644
index 0000000000..e3401c9ecc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_pjhyett-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "41b46164-ab52-4908-b424-bcfdf1031af2",
+  "name": "users_pjhyett",
+  "request": {
+    "url": "/users/pjhyett",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_pjhyett-5.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4946",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a0df33012eb7c9c6b9ac7eb7212e6c6d\"",
+      "Last-Modified": "Thu, 12 Jul 2018 15:25:03 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:291550D:3118BFD:5D9B916C"
+    }
+  },
+  "uuid": "41b46164-ab52-4908-b424-bcfdf1031af2",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10-900a0e.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10-900a0e.json
deleted file mode 100644
index a85f6c1c25..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10-900a0e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "900a0e1a-6b3a-4b29-9f14-d997f1139396",
-  "name": "users_vanpelt",
-  "request": {
-    "url": "/users/vanpelt",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_vanpelt-900a0e1a-6b3a-4b29-9f14-d997f1139396.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4941",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"c654218fefd7c0ed64ac8d4aaf0982d9\"",
-      "Last-Modified": "Sat, 05 Oct 2019 18:05:32 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:291554C:3118C4B:5D9B916C"
-    }
-  },
-  "uuid": "900a0e1a-6b3a-4b29-9f14-d997f1139396",
-  "persistent": true,
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10.json
new file mode 100644
index 0000000000..432914eaf2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_vanpelt-10.json
@@ -0,0 +1,48 @@
+{
+  "id": "900a0e1a-6b3a-4b29-9f14-d997f1139396",
+  "name": "users_vanpelt",
+  "request": {
+    "url": "/users/vanpelt",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_vanpelt-10.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"c654218fefd7c0ed64ac8d4aaf0982d9\"",
+      "Last-Modified": "Sat, 05 Oct 2019 18:05:32 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:291554C:3118C4B:5D9B916C"
+    }
+  },
+  "uuid": "900a0e1a-6b3a-4b29-9f14-d997f1139396",
+  "persistent": true,
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11-3e6233.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11-3e6233.json
deleted file mode 100644
index da4be49250..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11-3e6233.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4",
-  "name": "users_wayneeseguin",
-  "request": {
-    "url": "/users/wayneeseguin",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_wayneeseguin-3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4940",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9574589205cca2a58fd910560aaf88ec\"",
-      "Last-Modified": "Mon, 23 Sep 2019 14:26:01 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:291555A:3118C59:5D9B916D"
-    }
-  },
-  "uuid": "3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4",
-  "persistent": true,
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11.json
new file mode 100644
index 0000000000..cda9460694
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wayneeseguin-11.json
@@ -0,0 +1,48 @@
+{
+  "id": "3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4",
+  "name": "users_wayneeseguin",
+  "request": {
+    "url": "/users/wayneeseguin",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_wayneeseguin-11.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4940",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9574589205cca2a58fd910560aaf88ec\"",
+      "Last-Modified": "Mon, 23 Sep 2019 14:26:01 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:291555A:3118C59:5D9B916D"
+    }
+  },
+  "uuid": "3e6233c9-6a6b-4ca1-9a85-2f74a8372ba4",
+  "persistent": true,
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6-b5f8d0.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6-b5f8d0.json
deleted file mode 100644
index 456081a11b..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6-b5f8d0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a",
-  "name": "users_wycats",
-  "request": {
-    "url": "/users/wycats",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_wycats-b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4945",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f58c87d769d955344485cb90640643d6\"",
-      "Last-Modified": "Fri, 04 Oct 2019 17:16:23 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E258:2CE7:2915516:3118C08:5D9B916C"
-    }
-  },
-  "uuid": "b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6.json
new file mode 100644
index 0000000000..5b279d7cd1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/listUsers/mappings/users_wycats-6.json
@@ -0,0 +1,48 @@
+{
+  "id": "b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a",
+  "name": "users_wycats",
+  "request": {
+    "url": "/users/wycats",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_wycats-6.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:36 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4945",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f58c87d769d955344485cb90640643d6\"",
+      "Last-Modified": "Fri, 04 Oct 2019 17:16:23 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E258:2CE7:2915516:3118C08:5D9B916C"
+    }
+  },
+  "uuid": "b5f8d0de-4625-43eb-bc6a-6b87d8d79b6a",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/repositories_167174_contents_src_attributes_classesjs-d7ab2e43-a548-4208-a44b-5d15b0c3b195.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/repositories_167174_contents_src_attributes_classesjs-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/repositories_167174_contents_src_attributes_classesjs-d7ab2e43-a548-4208-a44b-5d15b0c3b195.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/repositories_167174_contents_src_attributes_classesjs-3.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/search_code-8ebadd89-ed2a-49f2-9dbd-490cadc9923a.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/search_code-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/search_code-8ebadd89-ed2a-49f2-9dbd-490cadc9923a.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/search_code-2.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/user-d3b1f32c-0a98-4c3d-a630-00f934483deb.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/user-d3b1f32c-0a98-4c3d-a630-00f934483deb.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3-d7ab2e.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3-d7ab2e.json
deleted file mode 100644
index 88163ea16c..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3-d7ab2e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d7ab2e43-a548-4208-a44b-5d15b0c3b195",
-  "name": "repositories_167174_contents_src_attributes_classesjs",
-  "request": {
-    "url": "/repositories/167174/contents/src/attributes/classes.js?ref=cf84696fd1d7fe314a11492606529b5a658ee9e3",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories_167174_contents_src_attributes_classesjs-d7ab2e43-a548-4208-a44b-5d15b0c3b195.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:19:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4816",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f1571eb5d0685c8cea8a394d90c61f3d9b5a8f82\"",
-      "Last-Modified": "Mon, 29 Apr 2019 20:56:09 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E9A8:67D6:350D5FA:3F0F530:5D9B9DEC"
-    }
-  },
-  "uuid": "d7ab2e43-a548-4208-a44b-5d15b0c3b195",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3.json
new file mode 100644
index 0000000000..bcd56e567f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/repositories_167174_contents_src_attributes_classesjs-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "d7ab2e43-a548-4208-a44b-5d15b0c3b195",
+  "name": "repositories_167174_contents_src_attributes_classesjs",
+  "request": {
+    "url": "/repositories/167174/contents/src/attributes/classes.js?ref=cf84696fd1d7fe314a11492606529b5a658ee9e3",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories_167174_contents_src_attributes_classesjs-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:19:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4816",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f1571eb5d0685c8cea8a394d90c61f3d9b5a8f82\"",
+      "Last-Modified": "Mon, 29 Apr 2019 20:56:09 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E9A8:67D6:350D5FA:3F0F530:5D9B9DEC"
+    }
+  },
+  "uuid": "d7ab2e43-a548-4208-a44b-5d15b0c3b195",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2-8ebadd.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2-8ebadd.json
deleted file mode 100644
index 5c78cb6eb4..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2-8ebadd.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "8ebadd89-ed2a-49f2-9dbd-490cadc9923a",
-  "name": "search_code",
-  "request": {
-    "url": "/search/code?q=addClass+in%3Afile+language%3Ajs+repo%3Ajquery%2Fjquery",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_code-8ebadd89-ed2a-49f2-9dbd-490cadc9923a.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:19:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "29",
-      "X-RateLimit-Reset": "1570479656",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E9A8:67D6:350D5BE:3F0F4B1:5D9B9DEB"
-    }
-  },
-  "uuid": "8ebadd89-ed2a-49f2-9dbd-490cadc9923a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2.json
new file mode 100644
index 0000000000..e92220c418
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/search_code-2.json
@@ -0,0 +1,43 @@
+{
+  "id": "8ebadd89-ed2a-49f2-9dbd-490cadc9923a",
+  "name": "search_code",
+  "request": {
+    "url": "/search/code?q=addClass+in%3Afile+language%3Ajs+repo%3Ajquery%2Fjquery",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_code-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:19:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "29",
+      "X-RateLimit-Reset": "1570479656",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E9A8:67D6:350D5BE:3F0F4B1:5D9B9DEB"
+    }
+  },
+  "uuid": "8ebadd89-ed2a-49f2-9dbd-490cadc9923a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1-d3b1f3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1-d3b1f3.json
deleted file mode 100644
index 5ea1dadda4..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1-d3b1f3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "d3b1f32c-0a98-4c3d-a630-00f934483deb",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d3b1f32c-0a98-4c3d-a630-00f934483deb.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:19:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4818",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E9A8:67D6:350D573:3F0F49D:5D9B9DEB"
-    }
-  },
-  "uuid": "d3b1f32c-0a98-4c3d-a630-00f934483deb",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1.json
new file mode 100644
index 0000000000..7ae07c725c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchContent/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "d3b1f32c-0a98-4c3d-a630-00f934483deb",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:19:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4818",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E9A8:67D6:350D573:3F0F49D:5D9B9DEB"
+    }
+  },
+  "uuid": "d3b1f32c-0a98-4c3d-a630-00f934483deb",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/search_users-0ca09437-a0ff-43ac-8953-215b38b51121.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/search_users-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/search_users-0ca09437-a0ff-43ac-8953-215b38b51121.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/search_users-2.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/user-76f6274b-3142-44e3-a93a-9584aa8bfe0d.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/user-76f6274b-3142-44e3-a93a-9584aa8bfe0d.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/users_mojombo-6e29c619-1712-420d-b911-4f937c2a5cb1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/users_mojombo-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/users_mojombo-6e29c619-1712-420d-b911-4f937c2a5cb1.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/__files/users_mojombo-3.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2-0ca094.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2-0ca094.json
deleted file mode 100644
index c731aae3a5..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2-0ca094.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "0ca09437-a0ff-43ac-8953-215b38b51121",
-  "name": "search_users",
-  "request": {
-    "url": "/search/users?q=tom+repos%3A%3E42+followers%3A%3E1000",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "search_users-0ca09437-a0ff-43ac-8953-215b38b51121.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "30",
-      "X-RateLimit-Remaining": "28",
-      "X-RateLimit-Reset": "1570476458",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "E25E:3C9F:28D084B:3074159:5D9B916D"
-    }
-  },
-  "uuid": "0ca09437-a0ff-43ac-8953-215b38b51121",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2.json
new file mode 100644
index 0000000000..9b81e906f6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/search_users-2.json
@@ -0,0 +1,43 @@
+{
+  "id": "0ca09437-a0ff-43ac-8953-215b38b51121",
+  "name": "search_users",
+  "request": {
+    "url": "/search/users?q=tom+repos%3A%3E42+followers%3A%3E1000",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "search_users-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "30",
+      "X-RateLimit-Remaining": "28",
+      "X-RateLimit-Reset": "1570476458",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "E25E:3C9F:28D084B:3074159:5D9B916D"
+    }
+  },
+  "uuid": "0ca09437-a0ff-43ac-8953-215b38b51121",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1-76f627.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1-76f627.json
deleted file mode 100644
index 12100b25af..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1-76f627.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "76f6274b-3142-44e3-a93a-9584aa8bfe0d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-76f6274b-3142-44e3-a93a-9584aa8bfe0d.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4936",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"cac42a681d528a42c7d3cb77dc768cad\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E25E:3C9F:28D0836:3074147:5D9B916D"
-    }
-  },
-  "uuid": "76f6274b-3142-44e3-a93a-9584aa8bfe0d",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1.json
new file mode 100644
index 0000000000..619dadd0d9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "76f6274b-3142-44e3-a93a-9584aa8bfe0d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"cac42a681d528a42c7d3cb77dc768cad\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E25E:3C9F:28D0836:3074147:5D9B916D"
+    }
+  },
+  "uuid": "76f6274b-3142-44e3-a93a-9584aa8bfe0d",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3-6e29c6.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3-6e29c6.json
deleted file mode 100644
index 7d0c056d76..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3-6e29c6.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "6e29c619-1712-420d-b911-4f937c2a5cb1",
-  "name": "users_mojombo",
-  "request": {
-    "url": "/users/mojombo",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "users_mojombo-6e29c619-1712-420d-b911-4f937c2a5cb1.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4935",
-      "X-RateLimit-Reset": "1570478899",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"73f9872269ba878bb4e8debba1fde991\"",
-      "Last-Modified": "Mon, 19 Aug 2019 19:50:56 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E25E:3C9F:28D085E:307416C:5D9B916E"
-    }
-  },
-  "uuid": "6e29c619-1712-420d-b911-4f937c2a5cb1",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3.json
new file mode 100644
index 0000000000..6e6150eeae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/searchUsers/mappings/users_mojombo-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "6e29c619-1712-420d-b911-4f937c2a5cb1",
+  "name": "users_mojombo",
+  "request": {
+    "url": "/users/mojombo",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "users_mojombo-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 19:26:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4935",
+      "X-RateLimit-Reset": "1570478899",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"73f9872269ba878bb4e8debba1fde991\"",
+      "Last-Modified": "Mon, 19 Aug 2019 19:50:56 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E25E:3C9F:28D085E:307416C:5D9B916E"
+    }
+  },
+  "uuid": "6e29c619-1712-420d-b911-4f937c2a5cb1",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-7bda3de6-8df5-4296-b787-0453ab408e59.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-7bda3de6-8df5-4296-b787-0453ab408e59.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-2.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-85ebe399-5214-499f-92fd-055f864faad2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-85ebe399-5214-499f-92fd-055f864faad2.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/repositories-3.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/user-9eed5705-4dda-41d0-86a0-7cf31d34af75.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/user-9eed5705-4dda-41d0-86a0-7cf31d34af75.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2-7bda3d.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2-7bda3d.json
deleted file mode 100644
index 44f2f80eb8..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2-7bda3d.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7bda3de6-8df5-4296-b787-0453ab408e59",
-  "name": "repositories",
-  "request": {
-    "url": "/repositories",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories-7bda3de6-8df5-4296-b787-0453ab408e59.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:19:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4824",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3e28fa903a1ab6189f83dc08e3827de7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E98F:3C9F:2919024:30CB00B:5D9B9DC0",
-      "Link": "<https://api.github.com/repositories?since=369>; rel=\"next\", <https://api.github.com/repositories{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "7bda3de6-8df5-4296-b787-0453ab408e59",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2.json
new file mode 100644
index 0000000000..a5ac98e09e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7bda3de6-8df5-4296-b787-0453ab408e59",
+  "name": "repositories",
+  "request": {
+    "url": "/repositories",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories-2.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:19:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4824",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3e28fa903a1ab6189f83dc08e3827de7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E98F:3C9F:2919024:30CB00B:5D9B9DC0",
+      "Link": "<https://api.github.com/repositories?since=369>; rel=\"next\", <https://api.github.com/repositories{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "7bda3de6-8df5-4296-b787-0453ab408e59",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3-85ebe3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3-85ebe3.json
deleted file mode 100644
index 63894121b6..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3-85ebe3.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "85ebe399-5214-499f-92fd-055f864faad2",
-  "name": "repositories",
-  "request": {
-    "url": "/repositories?since=369",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repositories-85ebe399-5214-499f-92fd-055f864faad2.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:19:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4823",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"77afebf7708dda01484673a22084f4b3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E98F:3C9F:291905C:30CB08E:5D9B9DC1",
-      "Link": "<https://api.github.com/repositories?since=876>; rel=\"next\", <https://api.github.com/repositories{?since}>; rel=\"first\""
-    }
-  },
-  "uuid": "85ebe399-5214-499f-92fd-055f864faad2",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3.json
new file mode 100644
index 0000000000..63a85f329c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/repositories-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "85ebe399-5214-499f-92fd-055f864faad2",
+  "name": "repositories",
+  "request": {
+    "url": "/repositories?since=369",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repositories-3.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:19:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4823",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"77afebf7708dda01484673a22084f4b3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E98F:3C9F:291905C:30CB08E:5D9B9DC1",
+      "Link": "<https://api.github.com/repositories?since=876>; rel=\"next\", <https://api.github.com/repositories{?since}>; rel=\"first\""
+    }
+  },
+  "uuid": "85ebe399-5214-499f-92fd-055f864faad2",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1-9eed57.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1-9eed57.json
deleted file mode 100644
index c45f95dd03..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1-9eed57.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "9eed5705-4dda-41d0-86a0-7cf31d34af75",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-9eed5705-4dda-41d0-86a0-7cf31d34af75.json",
-    "headers": {
-      "Date": "Mon, 07 Oct 2019 20:19:12 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4826",
-      "X-RateLimit-Reset": "1570482632",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E98F:3C9F:2918FD6:30CAFFA:5D9B9DC0"
-    }
-  },
-  "uuid": "9eed5705-4dda-41d0-86a0-7cf31d34af75",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1.json
new file mode 100644
index 0000000000..051b00b1e5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListAllRepositories/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "9eed5705-4dda-41d0-86a0-7cf31d34af75",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 07 Oct 2019 20:19:12 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4826",
+      "X-RateLimit-Reset": "1570482632",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"af0c41afcacb8ceee14b7d896719c3bd\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E98F:3C9F:2918FD6:30CAFFA:5D9B9DC0"
+    }
+  },
+  "uuid": "9eed5705-4dda-41d0-86a0-7cf31d34af75",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/__files/authorizations-4b8125f6-3ec7-4326-9682-19b9e0a05de5.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/__files/authorizations-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/__files/authorizations-4b8125f6-3ec7-4326-9682-19b9e0a05de5.json
rename to src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/__files/authorizations-1.json
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1-4b8125.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1-4b8125.json
deleted file mode 100644
index 5e5c00b548..0000000000
--- a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1-4b8125.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "4b8125f6-3ec7-4326-9682-19b9e0a05de5",
-  "name": "authorizations",
-  "request": {
-    "url": "/authorizations",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "authorizations-4b8125f6-3ec7-4326-9682-19b9e0a05de5.json",
-    "headers": {
-      "Date": "Tue, 08 Oct 2019 00:20:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4998",
-      "X-RateLimit-Reset": "1570497620",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b1dcc1eb3b257fa0478b4117e4468e28\"",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "E24A:382F:EEE316:111F0C1:5D9BD644"
-    }
-  },
-  "uuid": "4b8125f6-3ec7-4326-9682-19b9e0a05de5",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1.json b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1.json
new file mode 100644
index 0000000000..1a98c31ba9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GitHubTest/wiremock/testListMyAuthorizations/mappings/authorizations-1.json
@@ -0,0 +1,45 @@
+{
+  "id": "4b8125f6-3ec7-4326-9682-19b9e0a05de5",
+  "name": "authorizations",
+  "request": {
+    "url": "/authorizations",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "authorizations-1.json",
+    "headers": {
+      "Date": "Tue, 08 Oct 2019 00:20:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4998",
+      "X-RateLimit-Reset": "1570497620",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b1dcc1eb3b257fa0478b4117e4468e28\"",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E24A:382F:EEE316:111F0C1:5D9BD644"
+    }
+  },
+  "uuid": "4b8125f6-3ec7-4326-9682-19b9e0a05de5",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/__files/authorizations-3f50c6b0-2730-45e7-9c94-f4f71bf61db2.json b/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/__files/authorizations-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/__files/authorizations-3f50c6b0-2730-45e7-9c94-f4f71bf61db2.json
rename to src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/__files/authorizations-2.json
diff --git a/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-1-cdda4d.json b/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-1-cdda4d.json
rename to src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-1.json
diff --git a/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2-3f50c6.json b/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2-3f50c6.json
deleted file mode 100644
index 65a35a4f1d..0000000000
--- a/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2-3f50c6.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "3f50c6b0-2730-45e7-9c94-f4f71bf61db2",
-  "name": "authorizations",
-  "request": {
-    "url": "/authorizations",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"note\":\"Test2faTokenCreate\",\"note_url\":\"this is a test token created by a unit test\",\"scopes\":[\"repo\",\"gist\",\"write:packages\",\"read:packages\",\"delete:packages\",\"user\",\"delete_repo\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "authorizations-3f50c6b0-2730-45e7-9c94-f4f71bf61db2.json",
-    "headers": {
-      "Server": "GitHub.com",
-      "Date": "Tue, 12 Nov 2019 23:04:13 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4999",
-      "X-RateLimit-Reset": "1573603453",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
-      "ETag": "\"a13c56b386b13166f07b380d02243b12\"",
-      "Location": "https://api.github.com/authorizations/350917110",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EA5C:557C:1271445:29480C8:5DCB3A59"
-    }
-  },
-  "uuid": "3f50c6b0-2730-45e7-9c94-f4f71bf61db2",
-  "persistent": true,
-  "scenarioName": "scenario-1-authorizations",
-  "requiredScenarioState": "scenario-1-authorizations-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2.json b/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2.json
new file mode 100644
index 0000000000..c53daa3917
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/Github2faTest/wiremock/test2faToken/mappings/authorizations-2.json
@@ -0,0 +1,52 @@
+{
+  "id": "3f50c6b0-2730-45e7-9c94-f4f71bf61db2",
+  "name": "authorizations",
+  "request": {
+    "url": "/authorizations",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"note\":\"Test2faTokenCreate\",\"note_url\":\"this is a test token created by a unit test\",\"scopes\":[\"repo\",\"gist\",\"write:packages\",\"read:packages\",\"delete:packages\",\"user\",\"delete_repo\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "authorizations-2.json",
+    "headers": {
+      "Server": "GitHub.com",
+      "Date": "Tue, 12 Nov 2019 23:04:13 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4999",
+      "X-RateLimit-Reset": "1573603453",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP",
+      "ETag": "\"a13c56b386b13166f07b380d02243b12\"",
+      "Location": "https://api.github.com/authorizations/350917110",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EA5C:557C:1271445:29480C8:5DCB3A59"
+    }
+  },
+  "uuid": "3f50c6b0-2730-45e7-9c94-f4f71bf61db2",
+  "persistent": true,
+  "scenarioName": "scenario-1-authorizations",
+  "requiredScenarioState": "scenario-1-authorizations-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository-7e3d0849-0e5e-4f69-a836-1dddb01af7e0.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository-7e3d0849-0e5e-4f69-a836-1dddb01af7e0.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository-2.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_issues-606626d3-4ec8-4550-ae51-635d1b33f18a.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_issues-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_issues-606626d3-4ec8-4550-ae51-635d1b33f18a.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_issues-5.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_milestones-c1bb6957-ff70-4683-b8fd-4b7988cddf30.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_milestones-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_milestones-c1bb6957-ff70-4683-b8fd-4b7988cddf30.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_milestones-4.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-dc00c291-6359-453c-b7d9-ffc7e2c99ddb.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-dc00c291-6359-453c-b7d9-ffc7e2c99ddb.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-6.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-dc82f39e-dd3d-4d58-b635-761bb93f77c7.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-dc82f39e-dd3d-4d58-b635-761bb93f77c7.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases-7.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-ed473c58-ee06-4632-a9fd-99a3972024c5.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-ed473c58-ee06-4632-a9fd-99a3972024c5.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-42bb605f-8031-41c8-9749-2c23af78edee.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-42bb605f-8031-41c8-9749-2c23af78edee.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-7f61d00c-320b-417f-b155-39a8ff3c33ae.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-7f61d00c-320b-417f-b155-39a8ff3c33ae.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/user-864ebeb8-bf07-40c2-a910-3a3e54f81865.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/user-864ebeb8-bf07-40c2-a910-3a3e54f81865.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2-7e3d08.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2-7e3d08.json
deleted file mode 100644
index 9a4040f60a..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2-7e3d08.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "7e3d0849-0e5e-4f69-a836-1dddb01af7e0",
-  "name": "repos_github-api-test-org_temp-testcreaterepository",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository-7e3d0849-0e5e-4f69-a836-1dddb01af7e0.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4958",
-      "X-RateLimit-Reset": "1574822592",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26a7f16664bd9308808198d8736328f3\"",
-      "Last-Modified": "Wed, 27 Nov 2019 01:45:25 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963C68:B1F2CA:5DDDD530"
-    }
-  },
-  "uuid": "7e3d0849-0e5e-4f69-a836-1dddb01af7e0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2.json
new file mode 100644
index 0000000000..e5a87a169a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "7e3d0849-0e5e-4f69-a836-1dddb01af7e0",
+  "name": "repos_github-api-test-org_temp-testcreaterepository",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository-2.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4958",
+      "X-RateLimit-Reset": "1574822592",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26a7f16664bd9308808198d8736328f3\"",
+      "Last-Modified": "Wed, 27 Nov 2019 01:45:25 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963C68:B1F2CA:5DDDD530"
+    }
+  },
+  "uuid": "7e3d0849-0e5e-4f69-a836-1dddb01af7e0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5-606626.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5-606626.json
deleted file mode 100644
index 3f8039fc62..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5-606626.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "606626d3-4ec8-4550-ae51-635d1b33f18a",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_issues",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/issues",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"milestone\":1,\"assignees\":[\"bitwiseman\"],\"title\":\"Test Issue\",\"body\":\"issue body just for grins\",\"labels\":[\"bug\"]}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_issues-606626d3-4ec8-4550-ae51-635d1b33f18a.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4955",
-      "X-RateLimit-Reset": "1574822592",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"fa9abaea430d18c8d1b0d2f82c0bd613\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/temp-testCreateRepository/issues/1",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963CDA:B1F69F:5DDDD537"
-    }
-  },
-  "uuid": "606626d3-4ec8-4550-ae51-635d1b33f18a",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5.json
new file mode 100644
index 0000000000..5df5644c4a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_issues-5.json
@@ -0,0 +1,55 @@
+{
+  "id": "606626d3-4ec8-4550-ae51-635d1b33f18a",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_issues",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/issues",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"milestone\":1,\"assignees\":[\"bitwiseman\"],\"title\":\"Test Issue\",\"body\":\"issue body just for grins\",\"labels\":[\"bug\"]}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_issues-5.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4955",
+      "X-RateLimit-Reset": "1574822592",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"fa9abaea430d18c8d1b0d2f82c0bd613\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/temp-testCreateRepository/issues/1",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963CDA:B1F69F:5DDDD537"
+    }
+  },
+  "uuid": "606626d3-4ec8-4550-ae51-635d1b33f18a",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4-c1bb69.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4-c1bb69.json
deleted file mode 100644
index 8a109cc8e7..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4-c1bb69.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "c1bb6957-ff70-4683-b8fd-4b7988cddf30",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_milestones",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/milestones",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"description\":\"first one\",\"title\":\"Initial Release\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_milestones-c1bb6957-ff70-4683-b8fd-4b7988cddf30.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4956",
-      "X-RateLimit-Reset": "1574822592",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"66e9f2e4ba2293ac0ee410e8ab549de7\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "Location": "https://api.github.com/repos/github-api-test-org/temp-testCreateRepository/milestones/1",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963CA7:B1F675:5DDDD537"
-    }
-  },
-  "uuid": "c1bb6957-ff70-4683-b8fd-4b7988cddf30",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4.json
new file mode 100644
index 0000000000..fe31b78438
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_milestones-4.json
@@ -0,0 +1,55 @@
+{
+  "id": "c1bb6957-ff70-4683-b8fd-4b7988cddf30",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_milestones",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/milestones",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"description\":\"first one\",\"title\":\"Initial Release\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_milestones-4.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1574822592",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"66e9f2e4ba2293ac0ee410e8ab549de7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "Location": "https://api.github.com/repos/github-api-test-org/temp-testCreateRepository/milestones/1",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963CA7:B1F675:5DDDD537"
+    }
+  },
+  "uuid": "c1bb6957-ff70-4683-b8fd-4b7988cddf30",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-3-16498f.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-3-16498f.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-3.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6-dc00c2.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6-dc00c2.json
deleted file mode 100644
index f8c1afa709..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6-dc00c2.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "dc00c291-6359-453c-b7d9-ffc7e2c99ddb",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_releases",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"tag_name\":\"release_tag\",\"name\":\"Test Release\",\"body\":\"How exciting!  To be able to programmatically create releases is a dream come true!\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases-dc00c291-6359-453c-b7d9-ffc7e2c99ddb.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1574822592",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"097682b0eaf95e24f2e37354b14a84b6\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/temp-testCreateRepository/releases/21786739",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963D68:B1F730:5DDDD538"
-    }
-  },
-  "uuid": "dc00c291-6359-453c-b7d9-ffc7e2c99ddb",
-  "persistent": true,
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6.json
new file mode 100644
index 0000000000..bff5187754
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-6.json
@@ -0,0 +1,55 @@
+{
+  "id": "dc00c291-6359-453c-b7d9-ffc7e2c99ddb",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_releases",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"tag_name\":\"release_tag\",\"name\":\"Test Release\",\"body\":\"How exciting!  To be able to programmatically create releases is a dream come true!\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases-6.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1574822592",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"097682b0eaf95e24f2e37354b14a84b6\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/temp-testCreateRepository/releases/21786739",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963D68:B1F730:5DDDD538"
+    }
+  },
+  "uuid": "dc00c291-6359-453c-b7d9-ffc7e2c99ddb",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7-dc82f3.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7-dc82f3.json
deleted file mode 100644
index 3ed0882d47..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7-dc82f3.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "dc82f39e-dd3d-4d58-b635-761bb93f77c7",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_releases",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases-dc82f39e-dd3d-4d58-b635-761bb93f77c7.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4953",
-      "X-RateLimit-Reset": "1574822592",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8ba99dc2aba2d236a6eed851e1821baa\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963DE7:B1F7E8:5DDDD539"
-    }
-  },
-  "uuid": "dc82f39e-dd3d-4d58-b635-761bb93f77c7",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testCreateRepository-releases",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testCreateRepository-releases-2",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7.json
new file mode 100644
index 0000000000..65c0fe3dc9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases-7.json
@@ -0,0 +1,49 @@
+{
+  "id": "dc82f39e-dd3d-4d58-b635-761bb93f77c7",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_releases",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases-7.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1574822592",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8ba99dc2aba2d236a6eed851e1821baa\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963DE7:B1F7E8:5DDDD539"
+    }
+  },
+  "uuid": "dc82f39e-dd3d-4d58-b635-761bb93f77c7",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testCreateRepository-releases",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testCreateRepository-releases-2",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10-ed473c.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10-ed473c.json
deleted file mode 100644
index 6c7cf08fea..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10-ed473c.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ed473c58-ee06-4632-a9fd-99a3972024c5",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/21786739/assets",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-ed473c58-ee06-4632-a9fd-99a3972024c5.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1574822730",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"42d2858298a35fd3f7212f4db9d44606\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963E64:B1F87B:5DDDD53A"
-    }
-  },
-  "uuid": "ed473c58-ee06-4632-a9fd-99a3972024c5",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets",
-  "requiredScenarioState": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets-2",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets-3",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json
new file mode 100644
index 0000000000..eff39a839e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json
@@ -0,0 +1,50 @@
+{
+  "id": "ed473c58-ee06-4632-a9fd-99a3972024c5",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/21786739/assets",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-10.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4948",
+      "X-RateLimit-Reset": "1574822730",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"42d2858298a35fd3f7212f4db9d44606\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963E64:B1F87B:5DDDD53A"
+    }
+  },
+  "uuid": "ed473c58-ee06-4632-a9fd-99a3972024c5",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets",
+  "requiredScenarioState": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets-2",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets-3",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-12-383e6f.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-12-383e6f.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-12.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8-42bb60.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8-42bb60.json
deleted file mode 100644
index 3e4b458741..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8-42bb60.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "42bb605f-8031-41c8-9749-2c23af78edee",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/21786739/assets",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-42bb605f-8031-41c8-9749-2c23af78edee.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1574822730",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"dd403348ea8675e7ee90b23ee54cbd2a\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963E2E:B1F801:5DDDD539"
-    }
-  },
-  "uuid": "42bb605f-8031-41c8-9749-2c23af78edee",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets-2",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json
new file mode 100644
index 0000000000..ecd6eedb8f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json
@@ -0,0 +1,50 @@
+{
+  "id": "42bb605f-8031-41c8-9749-2c23af78edee",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/21786739/assets",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-8.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4950",
+      "X-RateLimit-Reset": "1574822730",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"dd403348ea8675e7ee90b23ee54cbd2a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963E2E:B1F801:5DDDD539"
+    }
+  },
+  "uuid": "42bb605f-8031-41c8-9749-2c23af78edee",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-temp-testCreateRepository-releases-21786739-assets-2",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-11-864573.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-11-864573.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-11.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9-7f61d0.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9-7f61d0.json
deleted file mode 100644
index c97b513812..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9-7f61d0.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "id": "7f61d00c-320b-417f-b155-39a8ff3c33ae",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/assets/16422841",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"label\":\"test label\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-7f61d00c-320b-417f-b155-39a8ff3c33ae.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1574822730",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"8729ae6ac53a5f39f6482a17fa071cf2\"",
-      "Last-Modified": "Wed, 27 Nov 2019 01:45:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963E41:B1F853:5DDDD53A"
-    }
-  },
-  "uuid": "7f61d00c-320b-417f-b155-39a8ff3c33ae",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json
new file mode 100644
index 0000000000..3974073626
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json
@@ -0,0 +1,55 @@
+{
+  "id": "7f61d00c-320b-417f-b155-39a8ff3c33ae",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/assets/16422841",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"label\":\"test label\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_assets_16422841-9.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4949",
+      "X-RateLimit-Reset": "1574822730",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"8729ae6ac53a5f39f6482a17fa071cf2\"",
+      "Last-Modified": "Wed, 27 Nov 2019 01:45:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963E41:B1F853:5DDDD53A"
+    }
+  },
+  "uuid": "7f61d00c-320b-417f-b155-39a8ff3c33ae",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1-864ebe.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1-864ebe.json
deleted file mode 100644
index 8cafa9a76f..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1-864ebe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "864ebeb8-bf07-40c2-a910-3a3e54f81865",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-864ebeb8-bf07-40c2-a910-3a3e54f81865.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4963",
-      "X-RateLimit-Reset": "1574822592",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"072b29f799172fd1523e04ec9f30fc24\"",
-      "Last-Modified": "Tue, 26 Nov 2019 22:02:50 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "D729:3497:963963:B1F2A7:5DDDD530"
-    }
-  },
-  "uuid": "864ebeb8-bf07-40c2-a910-3a3e54f81865",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1.json
new file mode 100644
index 0000000000..a525b65909
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "864ebeb8-bf07-40c2-a910-3a3e54f81865",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4963",
+      "X-RateLimit-Reset": "1574822592",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"072b29f799172fd1523e04ec9f30fc24\"",
+      "Last-Modified": "Tue, 26 Nov 2019 22:02:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D729:3497:963963:B1F2A7:5DDDD530"
+    }
+  },
+  "uuid": "864ebeb8-bf07-40c2-a910-3a3e54f81865",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-3069f0eb-aba0-4cc2-9bad-8aaa4e27e676.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-3069f0eb-aba0-4cc2-9bad-8aaa4e27e676.json
rename to src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/__files/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1-3069f0.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1-3069f0.json
deleted file mode 100644
index 35b51bff79..0000000000
--- a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1-3069f0.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "3069f0eb-aba0-4cc2-9bad-8aaa4e27e676",
-  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/21786739/assets?name=LICENSE.txt",
-    "method": "POST",
-    "bodyPatterns": [
-      {
-        "equalTo": " Copyright (c) 2011- Kohsuke Kawaguchi and other contributors\n\n Permission is hereby granted, free of charge, to any person\n obtaining a copy of this software and associated documentation\n files (the \"Software\"), to deal in the Software without\n restriction, including without limitation the rights to use,\n copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the\n Software is furnished to do so, subject to the following\n conditions:\n\n The above copyright notice and this permission notice shall be\n included in all copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\n OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n OTHER DEALINGS IN THE SOFTWARE.\n",
-        "caseInsensitive": false
-      }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-3069f0eb-aba0-4cc2-9bad-8aaa4e27e676.json",
-    "headers": {
-      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Cache-Control": "no-cache",
-      "Content-Security-Policy": "default-src 'none'",
-      "Etag": "W/\"037b49f1c38e9e0af7ed5a2978c5989d\"",
-      "Last-Modified": "Wed, 27 Nov 2019 01:45:30 GMT",
-      "Strict-Transport-Security": "max-age=31557600",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "X-Accepted-Oauth-Scopes": "repo",
-      "X-Content-Type-Options": "nosniff",
-      "X-Frame-Options": "deny",
-      "X-Github-Media-Type": "unknown, github.v3",
-      "X-Oauth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Xss-Protection": "1; mode=block",
-      "X-GitHub-Request-Id": "D72F:3D33:27CEE:309FD:5DDDD53A"
-    }
-  },
-  "uuid": "3069f0eb-aba0-4cc2-9bad-8aaa4e27e676",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json
new file mode 100644
index 0000000000..4364c75974
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/LifecycleTest/wiremock/testCreateRepository_uploads/mappings/repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "3069f0eb-aba0-4cc2-9bad-8aaa4e27e676",
+  "name": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testCreateRepository/releases/21786739/assets?name=LICENSE.txt",
+    "method": "POST",
+    "bodyPatterns": [
+      {
+        "equalTo": " Copyright (c) 2011- Kohsuke Kawaguchi and other contributors\n\n Permission is hereby granted, free of charge, to any person\n obtaining a copy of this software and associated documentation\n files (the \"Software\"), to deal in the Software without\n restriction, including without limitation the rights to use,\n copy, modify, merge, publish, distribute, sublicense, and/or sell\n copies of the Software, and to permit persons to whom the\n Software is furnished to do so, subject to the following\n conditions:\n\n The above copyright notice and this permission notice shall be\n included in all copies or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\n EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES\n OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n OTHER DEALINGS IN THE SOFTWARE.\n",
+        "caseInsensitive": false
+      }
+    ],
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_temp-testcreaterepository_releases_21786739_assets-1.json",
+    "headers": {
+      "Date": "Wed, 27 Nov 2019 01:45:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Cache-Control": "no-cache",
+      "Content-Security-Policy": "default-src 'none'",
+      "Etag": "W/\"037b49f1c38e9e0af7ed5a2978c5989d\"",
+      "Last-Modified": "Wed, 27 Nov 2019 01:45:30 GMT",
+      "Strict-Transport-Security": "max-age=31557600",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "X-Accepted-Oauth-Scopes": "repo",
+      "X-Content-Type-Options": "nosniff",
+      "X-Frame-Options": "deny",
+      "X-Github-Media-Type": "unknown, github.v3",
+      "X-Oauth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Xss-Protection": "1; mode=block",
+      "X-GitHub-Request-Id": "D72F:3D33:27CEE:309FD:5DDDD53A"
+    }
+  },
+  "uuid": "3069f0eb-aba0-4cc2-9bad-8aaa4e27e676",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
deleted file mode 100644
index 5ecaf7f506..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
new file mode 100644
index 0000000000..edbb0797ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "574da117-6845-46d8-b2c1-4415546ca670",
+  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
+      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
+    }
+  },
+  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json
deleted file mode 100644
index ecb5a24f9c..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json
new file mode 100644
index 0000000000..190feee1fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Fail/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
deleted file mode 100644
index 5ecaf7f506..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
new file mode 100644
index 0000000000..edbb0797ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "574da117-6845-46d8-b2c1-4415546ca670",
+  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
+      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
+    }
+  },
+  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json
deleted file mode 100644
index ecb5a24f9c..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json
new file mode 100644
index 0000000000..190feee1fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_HttpStatus_Fail/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
deleted file mode 100644
index 590fdfc13e..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testHandler_Wait",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Wait",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
new file mode 100644
index 0000000000..545ffcd63a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "574da117-6845-46d8-b2c1-4415546ca670",
+  "name": "repos_github-api-test-org_temp-testHandler_Wait",
+  "request": {
+    "url": "/repos/github-api-test-org/temp-testHandler_Wait",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4922",
+      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
+      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
+    }
+  },
+  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Wait-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json
deleted file mode 100644
index ecb5a24f9c..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json
new file mode 100644
index 0000000000..190feee1fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_Wait/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json
rename to src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2.json
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json
deleted file mode 100644
index ecb5a24f9c..0000000000
--- a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1-a60baf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-a60baf84-5b5c-4f86-af3d-cab0d609c7b2.json",
-    "headers": {
-      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4930",
-      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
-      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
-    }
-  },
-  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json
new file mode 100644
index 0000000000..190feee1fb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RateLimitHandlerTest/wiremock/testHandler_WaitStuck/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 06 Feb 2020 18:33:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4930",
+      "X-RateLimit-Reset": "{{now offset='3 seconds' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"1cb30f031c67c499473b3aad01c7f7a5\"",
+      "Last-Modified": "Thu, 06 Feb 2020 17:29:39 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CC37:2605:3F884:4E941:5E3C5BFC"
+    }
+  },
+  "uuid": "a60baf84-5b5c-4f86-af3d-cab0d609c7b2",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/orgs_github-api-88d7178c-b996-494c-a515-2c25a84b963e.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/orgs_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/orgs_github-api-88d7178c-b996-494c-a515-2c25a84b963e.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/orgs_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api-3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api-3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api_traffic_clones-08a276dd-fb7e-4c16-948f-0540ab719bc3.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api_traffic_clones-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api_traffic_clones-08a276dd-fb7e-4c16-948f-0540ab719bc3.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/repos_github-api_github-api_traffic_clones-4.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/user-b88f8444-c789-46b4-aa97-2e712ef5f1d3.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/user-b88f8444-c789-46b4-aa97-2e712ef5f1d3.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2-88d717.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2-88d717.json
deleted file mode 100644
index 4098f9e740..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2-88d717.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "88d7178c-b996-494c-a515-2c25a84b963e",
-  "name": "orgs_github-api",
-  "request": {
-    "url": "/orgs/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-88d7178c-b996-494c-a515-2c25a84b963e.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4972",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"995869dc2bbf322c71983b8990e49430\"",
-      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE75:0A39:5BE890:6D016C:5E506352"
-    }
-  },
-  "uuid": "88d7178c-b996-494c-a515-2c25a84b963e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2.json
new file mode 100644
index 0000000000..11e320d555
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/orgs_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "88d7178c-b996-494c-a515-2c25a84b963e",
+  "name": "orgs_github-api",
+  "request": {
+    "url": "/orgs/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4972",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"995869dc2bbf322c71983b8990e49430\"",
+      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE75:0A39:5BE890:6D016C:5E506352"
+    }
+  },
+  "uuid": "88d7178c-b996-494c-a515-2c25a84b963e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3-3e4826.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3-3e4826.json
deleted file mode 100644
index 3a1654cceb..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3-3e4826.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"8262ebbe283d8c1cd22c73190a3e875e\"",
-      "Last-Modified": "Fri, 21 Feb 2020 21:17:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE75:0A39:5BE8A5:6D01C0:5E506353"
-    }
-  },
-  "uuid": "3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..9d1f4c8d19
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"8262ebbe283d8c1cd22c73190a3e875e\"",
+      "Last-Modified": "Fri, 21 Feb 2020 21:17:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE75:0A39:5BE8A5:6D01C0:5E506353"
+    }
+  },
+  "uuid": "3e48260d-d5b0-45fd-8cbc-c816cc2fcc1a",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4-08a276.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4-08a276.json
deleted file mode 100644
index d725e739a0..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4-08a276.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "08a276dd-fb7e-4c16-948f-0540ab719bc3",
-  "name": "repos_github-api_github-api_traffic_clones",
-  "request": {
-    "url": "/repos/github-api/github-api/traffic/clones",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_traffic_clones-08a276dd-fb7e-4c16-948f-0540ab719bc3.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:11 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"fcfe9b5cdc965a0ec51543c5886c3080\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE75:0A39:5BE8BA:6D01D9:5E506353"
-    }
-  },
-  "uuid": "08a276dd-fb7e-4c16-948f-0540ab719bc3",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4.json
new file mode 100644
index 0000000000..d906e1a758
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/repos_github-api_github-api_traffic_clones-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "08a276dd-fb7e-4c16-948f-0540ab719bc3",
+  "name": "repos_github-api_github-api_traffic_clones",
+  "request": {
+    "url": "/repos/github-api/github-api/traffic/clones",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_traffic_clones-4.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:11 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"fcfe9b5cdc965a0ec51543c5886c3080\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE75:0A39:5BE8BA:6D01D9:5E506353"
+    }
+  },
+  "uuid": "08a276dd-fb7e-4c16-948f-0540ab719bc3",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1-b88f84.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1-b88f84.json
deleted file mode 100644
index 369b97a83d..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1-b88f84.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "b88f8444-c789-46b4-aa97-2e712ef5f1d3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b88f8444-c789-46b4-aa97-2e712ef5f1d3.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:10 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4974",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE75:0A39:5BE847:6D015B:5E506352"
-    }
-  },
-  "uuid": "b88f8444-c789-46b4-aa97-2e712ef5f1d3",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1.json
new file mode 100644
index 0000000000..488681e7c9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetClones/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "b88f8444-c789-46b4-aa97-2e712ef5f1d3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:10 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4974",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE75:0A39:5BE847:6D015B:5E506352"
+    }
+  },
+  "uuid": "b88f8444-c789-46b4-aa97-2e712ef5f1d3",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/orgs_github-api-test-org-cc28e414-38a3-4ca3-8b8a-15287f162c45.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/orgs_github-api-test-org-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/orgs_github-api-test-org-cc28e414-38a3-4ca3-8b8a-15287f162c45.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/orgs_github-api-test-org-1.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/repos_github-api-test-org_github-api-3e1a6044-86b2-4e41-9740-162d5972b659.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/repos_github-api-test-org_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/repos_github-api-test-org_github-api-3e1a6044-86b2-4e41-9740-162d5972b659.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/repos_github-api-test-org_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/user-bc05b9c5-0076-4faa-9747-ba5ce1ca2462.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/user-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/user-bc05b9c5-0076-4faa-9747-ba5ce1ca2462.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/__files/user-5.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1-cc28e4.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1-cc28e4.json
deleted file mode 100644
index 837e54e69e..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1-cc28e4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "cc28e414-38a3-4ca3-8b8a-15287f162c45",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-cc28e414-38a3-4ca3-8b8a-15287f162c45.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 16:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "55",
-      "X-RateLimit-Reset": "1575480297",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b7c896cc73f82e548f24a03da96c2b80\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5B8:1E5E0:8522AC7:9F46B3D:5DE7DDDA"
-    }
-  },
-  "uuid": "cc28e414-38a3-4ca3-8b8a-15287f162c45",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1.json
new file mode 100644
index 0000000000..bca71795e2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/orgs_github-api-test-org-1.json
@@ -0,0 +1,46 @@
+{
+  "id": "cc28e414-38a3-4ca3-8b8a-15287f162c45",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-1.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 16:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "55",
+      "X-RateLimit-Reset": "1575480297",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b7c896cc73f82e548f24a03da96c2b80\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5B8:1E5E0:8522AC7:9F46B3D:5DE7DDDA"
+    }
+  },
+  "uuid": "cc28e414-38a3-4ca3-8b8a-15287f162c45",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2-3e1a60.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2-3e1a60.json
deleted file mode 100644
index 6d71b0faf9..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2-3e1a60.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "3e1a6044-86b2-4e41-9740-162d5972b659",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-3e1a6044-86b2-4e41-9740-162d5972b659.json",
-    "headers": {
-      "Date": "Wed, 04 Dec 2019 16:24:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "60",
-      "X-RateLimit-Remaining": "54",
-      "X-RateLimit-Reset": "1575480297",
-      "Cache-Control": "public, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"d26461f84517a140f22bcc9c1a72b263\"",
-      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "A5B8:1E5E0:8522AE5:9F46B57:5DE7DDDB"
-    }
-  },
-  "uuid": "3e1a6044-86b2-4e41-9740-162d5972b659",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2.json
new file mode 100644
index 0000000000..b20056138b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api-2.json
@@ -0,0 +1,46 @@
+{
+  "id": "3e1a6044-86b2-4e41-9740-162d5972b659",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-2.json",
+    "headers": {
+      "Date": "Wed, 04 Dec 2019 16:24:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "60",
+      "X-RateLimit-Remaining": "54",
+      "X-RateLimit-Reset": "1575480297",
+      "Cache-Control": "public, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"d26461f84517a140f22bcc9c1a72b263\"",
+      "Last-Modified": "Thu, 07 Nov 2019 22:27:11 GMT",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "A5B8:1E5E0:8522AE5:9F46B57:5DE7DDDB"
+    }
+  },
+  "uuid": "3e1a6044-86b2-4e41-9740-162d5972b659",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_clones-4-8036aa.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_clones-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_clones-4-8036aa.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_clones-4.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_views-3-fe2649.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_views-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_views-3-fe2649.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/repos_github-api-test-org_github-api_traffic_views-3.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5-bc05b9.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5-bc05b9.json
deleted file mode 100644
index d3d6dbc866..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5-bc05b9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "bc05b9c5-0076-4faa-9747-ba5ce1ca2462",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-bc05b9c5-0076-4faa-9747-ba5ce1ca2462.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:13:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4957",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FF0F:1478:56CA40:674DAB:5E50641C"
-    }
-  },
-  "uuid": "bc05b9c5-0076-4faa-9747-ba5ce1ca2462",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5.json
new file mode 100644
index 0000000000..af8a413c98
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetTrafficStatsAccessFailureDueToInsufficientPermissions/mappings/user-5.json
@@ -0,0 +1,48 @@
+{
+  "id": "bc05b9c5-0076-4faa-9747-ba5ce1ca2462",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-5.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:13:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4957",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FF0F:1478:56CA40:674DAB:5E50641C"
+    }
+  },
+  "uuid": "bc05b9c5-0076-4faa-9747-ba5ce1ca2462",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/orgs_github-api-19310510-9871-43b9-95a2-e913f458c49e.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/orgs_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/orgs_github-api-19310510-9871-43b9-95a2-e913f458c49e.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/orgs_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api-266803c7-4757-493c-b2d0-affe324ff2ec.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api-266803c7-4757-493c-b2d0-affe324ff2ec.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api_traffic_views-1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api_traffic_views-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api_traffic_views-1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/repos_github-api_github-api_traffic_views-4.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/user-45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/user-45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc.json
rename to src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2-193105.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2-193105.json
deleted file mode 100644
index 6b058f1f36..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2-193105.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "19310510-9871-43b9-95a2-e913f458c49e",
-  "name": "orgs_github-api",
-  "request": {
-    "url": "/orgs/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-19310510-9871-43b9-95a2-e913f458c49e.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4962",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"995869dc2bbf322c71983b8990e49430\"",
-      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAF:0DBF:572D27:6804B6:5E506382"
-    }
-  },
-  "uuid": "19310510-9871-43b9-95a2-e913f458c49e",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2.json
new file mode 100644
index 0000000000..cb36423e70
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/orgs_github-api-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "19310510-9871-43b9-95a2-e913f458c49e",
+  "name": "orgs_github-api",
+  "request": {
+    "url": "/orgs/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-2.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4962",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"995869dc2bbf322c71983b8990e49430\"",
+      "Last-Modified": "Wed, 04 Sep 2019 18:12:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAF:0DBF:572D27:6804B6:5E506382"
+    }
+  },
+  "uuid": "19310510-9871-43b9-95a2-e913f458c49e",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3-266803.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3-266803.json
deleted file mode 100644
index 1c667a937b..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3-266803.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "266803c7-4757-493c-b2d0-affe324ff2ec",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-266803c7-4757-493c-b2d0-affe324ff2ec.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4961",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"8262ebbe283d8c1cd22c73190a3e875e\"",
-      "Last-Modified": "Fri, 21 Feb 2020 21:17:34 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAF:0DBF:572D39:6804FA:5E506383"
-    }
-  },
-  "uuid": "266803c7-4757-493c-b2d0-affe324ff2ec",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3.json
new file mode 100644
index 0000000000..c4f6baa942
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "266803c7-4757-493c-b2d0-affe324ff2ec",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-3.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4961",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"8262ebbe283d8c1cd22c73190a3e875e\"",
+      "Last-Modified": "Fri, 21 Feb 2020 21:17:34 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAF:0DBF:572D39:6804FA:5E506383"
+    }
+  },
+  "uuid": "266803c7-4757-493c-b2d0-affe324ff2ec",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4-1b9b0f.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4-1b9b0f.json
deleted file mode 100644
index 29bfc162a8..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4-1b9b0f.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e",
-  "name": "repos_github-api_github-api_traffic_views",
-  "request": {
-    "url": "/repos/github-api/github-api/traffic/views",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api_traffic_views-1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:59 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4960",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9201099749894ec401e10091da11bdb3\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAF:0DBF:572D53:680514:5E506383"
-    }
-  },
-  "uuid": "1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4.json
new file mode 100644
index 0000000000..f4cba56d4f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/repos_github-api_github-api_traffic_views-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e",
+  "name": "repos_github-api_github-api_traffic_views",
+  "request": {
+    "url": "/repos/github-api/github-api/traffic/views",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api_traffic_views-4.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:59 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4960",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9201099749894ec401e10091da11bdb3\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAF:0DBF:572D53:680514:5E506383"
+    }
+  },
+  "uuid": "1b9b0f33-559a-4b0e-bdbf-3786a8ebf34e",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1-45a8ae.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1-45a8ae.json
deleted file mode 100644
index 864c404ad9..0000000000
--- a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1-45a8ae.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc.json",
-    "headers": {
-      "Date": "Fri, 21 Feb 2020 23:10:58 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4964",
-      "X-RateLimit-Reset": "1582329421",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding, Accept, X-Requested-With"
-      ],
-      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
-      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEAF:0DBF:572CE3:680496:5E506382"
-    }
-  },
-  "uuid": "45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1.json
new file mode 100644
index 0000000000..63e8d0c336
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RepositoryTrafficTest/wiremock/testGetViews/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 21 Feb 2020 23:10:58 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4964",
+      "X-RateLimit-Reset": "1582329421",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With"
+      ],
+      "ETag": "W/\"9ba78fe3aeaabbbc6865aada56195a20\"",
+      "Last-Modified": "Fri, 21 Feb 2020 20:59:33 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEAF:0DBF:572CE3:680496:5E506382"
+    }
+  },
+  "uuid": "45a8ae4d-ca6c-4071-89ac-e588ce9cc9fc",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-0c314f70-2669-4eab-bf2e-f5589d189fc3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-0c314f70-2669-4eab-bf2e-f5589d189fc3.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-11.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-11c34ac5-e571-4be0-908f-34f415756461.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-11c34ac5-e571-4be0-908f-34f415756461.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-12.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-1697d11d-e650-4abb-8133-76adca36d207.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-1697d11d-e650-4abb-8133-76adca36d207.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-13.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-18196674-89f3-4d83-b040-8ba040eefd49.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-18196674-89f3-4d83-b040-8ba040eefd49.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-14.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-2207e235-976a-4140-903a-377a8dd1746c.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-2207e235-976a-4140-903a-377a8dd1746c.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-15.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-26564f19-513b-412a-8a71-299fc5559107.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-26564f19-513b-412a-8a71-299fc5559107.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-16.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-29f32c7d-9a05-4c8f-9d30-ccfd0600e382.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-18.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-29f32c7d-9a05-4c8f-9d30-ccfd0600e382.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-18.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-3ff83aaf-e95a-4822-a07d-ce5ed0a69d72.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-3ff83aaf-e95a-4822-a07d-ce5ed0a69d72.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-41b780e5-520d-40c9-96a0-5706f9d1f7cd.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-20.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-41b780e5-520d-40c9-96a0-5706f9d1f7cd.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-20.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-5b634f3d-fc06-4fe5-881e-939025d44b3e.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-21.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-5b634f3d-fc06-4fe5-881e-939025d44b3e.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-21.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-679857c5-9fbc-4649-a3ba-e16f6d3dd634.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-22.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-679857c5-9fbc-4649-a3ba-e16f6d3dd634.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-22.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-6c31e6bc-0743-4129-9d14-971c4ccc206b.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-23.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-6c31e6bc-0743-4129-9d14-971c4ccc206b.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-23.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-87ba7d98-2c27-4e74-b00d-7e68b2edf46b.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-24.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-87ba7d98-2c27-4e74-b00d-7e68b2edf46b.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-24.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-a56b2a87-ca72-4563-a260-8fa3edbc01c8.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-25.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-a56b2a87-ca72-4563-a260-8fa3edbc01c8.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-25.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-ab454363-9011-43bb-b8ad-25db5e637745.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-27.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-ab454363-9011-43bb-b8ad-25db5e637745.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-27.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-aed0ad15-f9fa-46ae-ab69-21636107fa98.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-aed0ad15-f9fa-46ae-ab69-21636107fa98.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-b58aab3d-fba1-4ade-8f09-9f4454ed9503.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-b58aab3d-fba1-4ade-8f09-9f4454ed9503.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-dbc7af41-968a-4896-ab95-ab2517627b62.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-dbc7af41-968a-4896-ab95-ab2517627b62.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-5.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-e1da686a-60ab-4ae1-bd38-50e48fbd8359.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-e1da686a-60ab-4ae1-bd38-50e48fbd8359.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-6.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-e8bcc900-cf03-4965-b873-cb3dd08d96a9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-e8bcc900-cf03-4965-b873-cb3dd08d96a9.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-7.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-e9b92506-2108-4a5a-857a-7148561f8f9f.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-e9b92506-2108-4a5a-857a-7148561f8f9f.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/orgs_github-api-test-org-9.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-2fd80c42-5b79-4ccd-992e-e11223b55091.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-2fd80c42-5b79-4ccd-992e-e11223b55091.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-733192e5-f8b3-4498-bf3f-e89fa280bced.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-733192e5-f8b3-4498-bf3f-e89fa280bced.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-10.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-944cefaf-a462-4bbf-8f09-87612eb625c7.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-944cefaf-a462-4bbf-8f09-87612eb625c7.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-17.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-b8119a27-5fa5-406a-b5f6-c0d3a966b529.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-19.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-b8119a27-5fa5-406a-b5f6-c0d3a966b529.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-19.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-bfd48b7a-b57d-421c-8624-c024e0d637a0.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-26.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-bfd48b7a-b57d-421c-8624-c024e0d637a0.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-26.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-f66a5d48-3dda-4b5a-91b7-720423ae348d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-f66a5d48-3dda-4b5a-91b7-720423ae348d.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/__files/user-8.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11-5b634f.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11-5b634f.json
deleted file mode 100644
index 4fcb4ecfa5..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11-5b634f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5b634f3d-fc06-4fe5-881e-939025d44b3e",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5b634f3d-fc06-4fe5-881e-939025d44b3e.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4870",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E43:E62E7C:5E2BCF9F"
-    }
-  },
-  "uuid": "5b634f3d-fc06-4fe5-881e-939025d44b3e",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-8",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-9",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11.json
new file mode 100644
index 0000000000..47f5982747
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-11.json
@@ -0,0 +1,51 @@
+{
+  "id": "5b634f3d-fc06-4fe5-881e-939025d44b3e",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-11.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4870",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E43:E62E7C:5E2BCF9F"
+    }
+  },
+  "uuid": "5b634f3d-fc06-4fe5-881e-939025d44b3e",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-8",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-9",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12-29f32c.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12-29f32c.json
deleted file mode 100644
index 1359fdedf8..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12-29f32c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "29f32c7d-9a05-4c8f-9d30-ccfd0600e382",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-29f32c7d-9a05-4c8f-9d30-ccfd0600e382.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4869",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E4F:E62E83:5E2BCF9F"
-    }
-  },
-  "uuid": "29f32c7d-9a05-4c8f-9d30-ccfd0600e382",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-9",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-10",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12.json
new file mode 100644
index 0000000000..04b9eb5f80
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-12.json
@@ -0,0 +1,51 @@
+{
+  "id": "29f32c7d-9a05-4c8f-9d30-ccfd0600e382",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-12.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4869",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E4F:E62E83:5E2BCF9F"
+    }
+  },
+  "uuid": "29f32c7d-9a05-4c8f-9d30-ccfd0600e382",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-9",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-10",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13-181966.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13-181966.json
deleted file mode 100644
index f510cbc9b2..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13-181966.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "18196674-89f3-4d83-b040-8ba040eefd49",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-18196674-89f3-4d83-b040-8ba040eefd49.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4868",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E5D:E62E94:5E2BCF9F"
-    }
-  },
-  "uuid": "18196674-89f3-4d83-b040-8ba040eefd49",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-10",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-11",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13.json
new file mode 100644
index 0000000000..9d580a2325
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-13.json
@@ -0,0 +1,52 @@
+{
+  "id": "18196674-89f3-4d83-b040-8ba040eefd49",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-13.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4868",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E5D:E62E94:5E2BCF9F"
+    }
+  },
+  "uuid": "18196674-89f3-4d83-b040-8ba040eefd49",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-10",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-11",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14-11c34a.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14-11c34a.json
deleted file mode 100644
index 756341f1f3..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14-11c34a.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "11c34ac5-e571-4be0-908f-34f415756461",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-11c34ac5-e571-4be0-908f-34f415756461.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4867",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E6C:E62EAA:5E2BCFA0"
-    }
-  },
-  "uuid": "11c34ac5-e571-4be0-908f-34f415756461",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-11",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-12",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14.json
new file mode 100644
index 0000000000..58e47fbae4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-14.json
@@ -0,0 +1,51 @@
+{
+  "id": "11c34ac5-e571-4be0-908f-34f415756461",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-14.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4867",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E6C:E62EAA:5E2BCFA0"
+    }
+  },
+  "uuid": "11c34ac5-e571-4be0-908f-34f415756461",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-11",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-12",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15-41b780.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15-41b780.json
deleted file mode 100644
index f0ce08d32e..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15-41b780.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "41b780e5-520d-40c9-96a0-5706f9d1f7cd",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-41b780e5-520d-40c9-96a0-5706f9d1f7cd.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4866",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E7D:E62EBA:5E2BCFA0"
-    }
-  },
-  "uuid": "41b780e5-520d-40c9-96a0-5706f9d1f7cd",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-12",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-13",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15.json
new file mode 100644
index 0000000000..5849b69e0e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-15.json
@@ -0,0 +1,51 @@
+{
+  "id": "41b780e5-520d-40c9-96a0-5706f9d1f7cd",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-15.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4866",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E7D:E62EBA:5E2BCFA0"
+    }
+  },
+  "uuid": "41b780e5-520d-40c9-96a0-5706f9d1f7cd",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-12",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-13",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16-6c31e6.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16-6c31e6.json
deleted file mode 100644
index ee1bc32417..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16-6c31e6.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "6c31e6bc-0743-4129-9d14-971c4ccc206b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-6c31e6bc-0743-4129-9d14-971c4ccc206b.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4865",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E8F:E62ED0:5E2BCFA0"
-    }
-  },
-  "uuid": "6c31e6bc-0743-4129-9d14-971c4ccc206b",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-13",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-14",
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16.json
new file mode 100644
index 0000000000..5112cd1089
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-16.json
@@ -0,0 +1,51 @@
+{
+  "id": "6c31e6bc-0743-4129-9d14-971c4ccc206b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-16.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4865",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E8F:E62ED0:5E2BCFA0"
+    }
+  },
+  "uuid": "6c31e6bc-0743-4129-9d14-971c4ccc206b",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-13",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-14",
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18-b58aab.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18-b58aab.json
deleted file mode 100644
index 27084e31fb..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18-b58aab.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "b58aab3d-fba1-4ade-8f09-9f4454ed9503",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b58aab3d-fba1-4ade-8f09-9f4454ed9503.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4863",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E9E:E62EEB:5E2BCFA1"
-    }
-  },
-  "uuid": "b58aab3d-fba1-4ade-8f09-9f4454ed9503",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-14",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-15",
-  "insertionIndex": 18
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18.json
new file mode 100644
index 0000000000..20548e44cf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-18.json
@@ -0,0 +1,51 @@
+{
+  "id": "b58aab3d-fba1-4ade-8f09-9f4454ed9503",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-18.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4863",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E9E:E62EEB:5E2BCFA1"
+    }
+  },
+  "uuid": "b58aab3d-fba1-4ade-8f09-9f4454ed9503",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-14",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-15",
+  "insertionIndex": 18
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2-2207e2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2-2207e2.json
deleted file mode 100644
index 7dce936a5d..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2-2207e2.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2207e235-976a-4140-903a-377a8dd1746c",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-2207e235-976a-4140-903a-377a8dd1746c.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4879",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6DE1:E62E05:5E2BCF9D"
-    }
-  },
-  "uuid": "2207e235-976a-4140-903a-377a8dd1746c",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..cda8e6d613
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,51 @@
+{
+  "id": "2207e235-976a-4140-903a-377a8dd1746c",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4879",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6DE1:E62E05:5E2BCF9D"
+    }
+  },
+  "uuid": "2207e235-976a-4140-903a-377a8dd1746c",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20-1697d1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20-1697d1.json
deleted file mode 100644
index f51ec155f1..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20-1697d1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "1697d11d-e650-4abb-8133-76adca36d207",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-1697d11d-e650-4abb-8133-76adca36d207.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4861",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6EB7:E62F09:5E2BCFA1"
-    }
-  },
-  "uuid": "1697d11d-e650-4abb-8133-76adca36d207",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-15",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-16",
-  "insertionIndex": 20
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20.json
new file mode 100644
index 0000000000..5c3d5472c6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-20.json
@@ -0,0 +1,51 @@
+{
+  "id": "1697d11d-e650-4abb-8133-76adca36d207",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-20.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4861",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6EB7:E62F09:5E2BCFA1"
+    }
+  },
+  "uuid": "1697d11d-e650-4abb-8133-76adca36d207",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-15",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-16",
+  "insertionIndex": 20
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21-ab4543.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21-ab4543.json
deleted file mode 100644
index b0c975752b..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21-ab4543.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "ab454363-9011-43bb-b8ad-25db5e637745",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-ab454363-9011-43bb-b8ad-25db5e637745.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4860",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6EC7:E62F19:5E2BCFA1"
-    }
-  },
-  "uuid": "ab454363-9011-43bb-b8ad-25db5e637745",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-16",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-17",
-  "insertionIndex": 21
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21.json
new file mode 100644
index 0000000000..0a0ac48b9a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-21.json
@@ -0,0 +1,51 @@
+{
+  "id": "ab454363-9011-43bb-b8ad-25db5e637745",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-21.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4860",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6EC7:E62F19:5E2BCFA1"
+    }
+  },
+  "uuid": "ab454363-9011-43bb-b8ad-25db5e637745",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-16",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-17",
+  "insertionIndex": 21
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22-a56b2a.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22-a56b2a.json
deleted file mode 100644
index 760bff88f7..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22-a56b2a.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "a56b2a87-ca72-4563-a260-8fa3edbc01c8",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-a56b2a87-ca72-4563-a260-8fa3edbc01c8.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4859",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6ED7:E62F2A:5E2BCFA1"
-    }
-  },
-  "uuid": "a56b2a87-ca72-4563-a260-8fa3edbc01c8",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-17",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-18",
-  "insertionIndex": 22
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22.json
new file mode 100644
index 0000000000..b6246c0bad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-22.json
@@ -0,0 +1,52 @@
+{
+  "id": "a56b2a87-ca72-4563-a260-8fa3edbc01c8",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-22.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4859",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6ED7:E62F2A:5E2BCFA1"
+    }
+  },
+  "uuid": "a56b2a87-ca72-4563-a260-8fa3edbc01c8",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-17",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-18",
+  "insertionIndex": 22
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23-e9b925.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23-e9b925.json
deleted file mode 100644
index f65037b035..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23-e9b925.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "e9b92506-2108-4a5a-857a-7148561f8f9f",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-e9b92506-2108-4a5a-857a-7148561f8f9f.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4858",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6EDD:E62F39:5E2BCFA2"
-    }
-  },
-  "uuid": "e9b92506-2108-4a5a-857a-7148561f8f9f",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-18",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-19",
-  "insertionIndex": 23
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23.json
new file mode 100644
index 0000000000..e8f165a2cb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-23.json
@@ -0,0 +1,52 @@
+{
+  "id": "e9b92506-2108-4a5a-857a-7148561f8f9f",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-23.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4858",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6EDD:E62F39:5E2BCFA2"
+    }
+  },
+  "uuid": "e9b92506-2108-4a5a-857a-7148561f8f9f",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-18",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-19",
+  "insertionIndex": 23
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24-aed0ad.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24-aed0ad.json
deleted file mode 100644
index bec2ffd196..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24-aed0ad.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "aed0ad15-f9fa-46ae-ab69-21636107fa98",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-aed0ad15-f9fa-46ae-ab69-21636107fa98.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:26 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4857",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6EF3:E62F48:5E2BCFA2"
-    }
-  },
-  "uuid": "aed0ad15-f9fa-46ae-ab69-21636107fa98",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-19",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-20",
-  "insertionIndex": 24
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24.json
new file mode 100644
index 0000000000..aa6ad5b873
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-24.json
@@ -0,0 +1,51 @@
+{
+  "id": "aed0ad15-f9fa-46ae-ab69-21636107fa98",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-24.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:26 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4857",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6EF3:E62F48:5E2BCFA2"
+    }
+  },
+  "uuid": "aed0ad15-f9fa-46ae-ab69-21636107fa98",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-19",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-20",
+  "insertionIndex": 24
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25-0c314f.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25-0c314f.json
deleted file mode 100644
index 06f56ce475..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25-0c314f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "0c314f70-2669-4eab-bf2e-f5589d189fc3",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-0c314f70-2669-4eab-bf2e-f5589d189fc3.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4856",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6F00:E62F5B:5E2BCFA2"
-    }
-  },
-  "uuid": "0c314f70-2669-4eab-bf2e-f5589d189fc3",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-20",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-21",
-  "insertionIndex": 25
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25.json
new file mode 100644
index 0000000000..622eebfb69
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-25.json
@@ -0,0 +1,51 @@
+{
+  "id": "0c314f70-2669-4eab-bf2e-f5589d189fc3",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-25.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4856",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6F00:E62F5B:5E2BCFA2"
+    }
+  },
+  "uuid": "0c314f70-2669-4eab-bf2e-f5589d189fc3",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-20",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-21",
+  "insertionIndex": 25
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27-87ba7d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27-87ba7d.json
deleted file mode 100644
index 10a79a416d..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27-87ba7d.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "87ba7d98-2c27-4e74-b00d-7e68b2edf46b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-87ba7d98-2c27-4e74-b00d-7e68b2edf46b.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4854",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6F20:E62F7F:5E2BCFA3"
-    }
-  },
-  "uuid": "87ba7d98-2c27-4e74-b00d-7e68b2edf46b",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-21",
-  "insertionIndex": 27
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27.json
new file mode 100644
index 0000000000..a940ba56dd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-27.json
@@ -0,0 +1,50 @@
+{
+  "id": "87ba7d98-2c27-4e74-b00d-7e68b2edf46b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-27.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4854",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6F20:E62F7F:5E2BCFA3"
+    }
+  },
+  "uuid": "87ba7d98-2c27-4e74-b00d-7e68b2edf46b",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-21",
+  "insertionIndex": 27
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3-679857.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3-679857.json
deleted file mode 100644
index f8166169b6..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3-679857.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "679857c5-9fbc-4649-a3ba-e16f6d3dd634",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-679857c5-9fbc-4649-a3ba-e16f6d3dd634.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4878",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6DEE:E62E0F:5E2BCF9D"
-    }
-  },
-  "uuid": "679857c5-9fbc-4649-a3ba-e16f6d3dd634",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-2",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-3",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..f8dcb2f2e7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "679857c5-9fbc-4649-a3ba-e16f6d3dd634",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4878",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6DEE:E62E0F:5E2BCF9D"
+    }
+  },
+  "uuid": "679857c5-9fbc-4649-a3ba-e16f6d3dd634",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-2",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-3",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4-26564f.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4-26564f.json
deleted file mode 100644
index 9612cea15d..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4-26564f.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "26564f19-513b-412a-8a71-299fc5559107",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-26564f19-513b-412a-8a71-299fc5559107.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4877",
-      "X-RateLimit-Reset": "1579932374",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6DFD:E62E25:5E2BCF9D"
-    }
-  },
-  "uuid": "26564f19-513b-412a-8a71-299fc5559107",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-3",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-4",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4.json
new file mode 100644
index 0000000000..9fec4bd8b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-4.json
@@ -0,0 +1,51 @@
+{
+  "id": "26564f19-513b-412a-8a71-299fc5559107",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-4.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4877",
+      "X-RateLimit-Reset": "1579932374",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6DFD:E62E25:5E2BCF9D"
+    }
+  },
+  "uuid": "26564f19-513b-412a-8a71-299fc5559107",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-3",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-4",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5-e8bcc9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5-e8bcc9.json
deleted file mode 100644
index 33e164db4c..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5-e8bcc9.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "e8bcc900-cf03-4965-b873-cb3dd08d96a9",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-e8bcc900-cf03-4965-b873-cb3dd08d96a9.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4876",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E08:E62E38:5E2BCF9E"
-    }
-  },
-  "uuid": "e8bcc900-cf03-4965-b873-cb3dd08d96a9",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-4",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-5",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5.json
new file mode 100644
index 0000000000..f9633905b5
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "e8bcc900-cf03-4965-b873-cb3dd08d96a9",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-5.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4876",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E08:E62E38:5E2BCF9E"
+    }
+  },
+  "uuid": "e8bcc900-cf03-4965-b873-cb3dd08d96a9",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-4",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-5",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6-e1da68.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6-e1da68.json
deleted file mode 100644
index b8d78efdf9..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6-e1da68.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "e1da686a-60ab-4ae1-bd38-50e48fbd8359",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-e1da686a-60ab-4ae1-bd38-50e48fbd8359.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4875",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E19:E62E45:5E2BCF9E"
-    }
-  },
-  "uuid": "e1da686a-60ab-4ae1-bd38-50e48fbd8359",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-5",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-6",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6.json
new file mode 100644
index 0000000000..7c0e13e0e3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "e1da686a-60ab-4ae1-bd38-50e48fbd8359",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-6.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4875",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E19:E62E45:5E2BCF9E"
+    }
+  },
+  "uuid": "e1da686a-60ab-4ae1-bd38-50e48fbd8359",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-5",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-6",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7-dbc7af.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7-dbc7af.json
deleted file mode 100644
index 15708dc675..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7-dbc7af.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "dbc7af41-968a-4896-ab95-ab2517627b62",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-dbc7af41-968a-4896-ab95-ab2517627b62.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4874",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E21:E62E4C:5E2BCF9E"
-    }
-  },
-  "uuid": "dbc7af41-968a-4896-ab95-ab2517627b62",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-6",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-7",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7.json
new file mode 100644
index 0000000000..bd854ed55b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-7.json
@@ -0,0 +1,51 @@
+{
+  "id": "dbc7af41-968a-4896-ab95-ab2517627b62",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-7.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4874",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E21:E62E4C:5E2BCF9E"
+    }
+  },
+  "uuid": "dbc7af41-968a-4896-ab95-ab2517627b62",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-6",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-7",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9-3ff83a.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9-3ff83a.json
deleted file mode 100644
index 941dd688a1..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9-3ff83a.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "3ff83aaf-e95a-4822-a07d-ce5ed0a69d72",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-3ff83aaf-e95a-4822-a07d-ce5ed0a69d72.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4872",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E2F:E62E63:5E2BCF9F"
-    }
-  },
-  "uuid": "3ff83aaf-e95a-4822-a07d-ce5ed0a69d72",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-7",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-8",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9.json
new file mode 100644
index 0000000000..05205c69fe
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/orgs_github-api-test-org-9.json
@@ -0,0 +1,51 @@
+{
+  "id": "3ff83aaf-e95a-4822-a07d-ce5ed0a69d72",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-9.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4872",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E2F:E62E63:5E2BCF9F"
+    }
+  },
+  "uuid": "3ff83aaf-e95a-4822-a07d-ce5ed0a69d72",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-7",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-8",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1-733192.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1-733192.json
deleted file mode 100644
index 0100f1e531..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1-733192.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "id": "733192e5-f8b3-4498-bf3f-e89fa280bced",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-733192e5-f8b3-4498-bf3f-e89fa280bced.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:21 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4880",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6DDB:E62DFD:5E2BCF9D"
-    }
-  },
-  "uuid": "733192e5-f8b3-4498-bf3f-e89fa280bced",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-user-2",
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1.json
new file mode 100644
index 0000000000..0fdac7edd8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-1.json
@@ -0,0 +1,52 @@
+{
+  "id": "733192e5-f8b3-4498-bf3f-e89fa280bced",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:21 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4880",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6DDB:E62DFD:5E2BCF9D"
+    }
+  },
+  "uuid": "733192e5-f8b3-4498-bf3f-e89fa280bced",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-user-2",
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10-2fd80c.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10-2fd80c.json
deleted file mode 100644
index 5907594d43..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10-2fd80c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2fd80c42-5b79-4ccd-992e-e11223b55091",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-2fd80c42-5b79-4ccd-992e-e11223b55091.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4871",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E3A:E62E71:5E2BCF9F"
-    }
-  },
-  "uuid": "2fd80c42-5b79-4ccd-992e-e11223b55091",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-3",
-  "newScenarioState": "scenario-1-user-4",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10.json
new file mode 100644
index 0000000000..e5104d88a8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-10.json
@@ -0,0 +1,51 @@
+{
+  "id": "2fd80c42-5b79-4ccd-992e-e11223b55091",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-10.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4871",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E3A:E62E71:5E2BCF9F"
+    }
+  },
+  "uuid": "2fd80c42-5b79-4ccd-992e-e11223b55091",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-3",
+  "newScenarioState": "scenario-1-user-4",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17-944cef.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17-944cef.json
deleted file mode 100644
index 4c3fc07945..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17-944cef.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "944cefaf-a462-4bbf-8f09-87612eb625c7",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-944cefaf-a462-4bbf-8f09-87612eb625c7.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4864",
-      "X-RateLimit-Reset": "1579932374",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E98:E62EDD:5E2BCFA0"
-    }
-  },
-  "uuid": "944cefaf-a462-4bbf-8f09-87612eb625c7",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-4",
-  "newScenarioState": "scenario-1-user-5",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17.json
new file mode 100644
index 0000000000..83ba1f0c62
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-17.json
@@ -0,0 +1,51 @@
+{
+  "id": "944cefaf-a462-4bbf-8f09-87612eb625c7",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-17.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4864",
+      "X-RateLimit-Reset": "1579932374",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E98:E62EDD:5E2BCFA0"
+    }
+  },
+  "uuid": "944cefaf-a462-4bbf-8f09-87612eb625c7",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-4",
+  "newScenarioState": "scenario-1-user-5",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19-bfd48b.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19-bfd48b.json
deleted file mode 100644
index dc39d954fb..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19-bfd48b.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "bfd48b7a-b57d-421c-8624-c024e0d637a0",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-bfd48b7a-b57d-421c-8624-c024e0d637a0.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4862",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6EAC:E62EFD:5E2BCFA1"
-    }
-  },
-  "uuid": "bfd48b7a-b57d-421c-8624-c024e0d637a0",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-5",
-  "newScenarioState": "scenario-1-user-6",
-  "insertionIndex": 19
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19.json
new file mode 100644
index 0000000000..4d80a50d25
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-19.json
@@ -0,0 +1,51 @@
+{
+  "id": "bfd48b7a-b57d-421c-8624-c024e0d637a0",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-19.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4862",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6EAC:E62EFD:5E2BCFA1"
+    }
+  },
+  "uuid": "bfd48b7a-b57d-421c-8624-c024e0d637a0",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-5",
+  "newScenarioState": "scenario-1-user-6",
+  "insertionIndex": 19
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26-f66a5d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26-f66a5d.json
deleted file mode 100644
index ad994df910..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26-f66a5d.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "f66a5d48-3dda-4b5a-91b7-720423ae348d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-f66a5d48-3dda-4b5a-91b7-720423ae348d.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4855",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6F07:E62F69:5E2BCFA3"
-    }
-  },
-  "uuid": "f66a5d48-3dda-4b5a-91b7-720423ae348d",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-6",
-  "insertionIndex": 26
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26.json
new file mode 100644
index 0000000000..3216b02fd0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-26.json
@@ -0,0 +1,50 @@
+{
+  "id": "f66a5d48-3dda-4b5a-91b7-720423ae348d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-26.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4855",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6F07:E62F69:5E2BCFA3"
+    }
+  },
+  "uuid": "f66a5d48-3dda-4b5a-91b7-720423ae348d",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-6",
+  "insertionIndex": 26
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8-b8119a.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8-b8119a.json
deleted file mode 100644
index 0be7c6d58d..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8-b8119a.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "b8119a27-5fa5-406a-b5f6-c0d3a966b529",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b8119a27-5fa5-406a-b5f6-c0d3a966b529.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4873",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEC4:4E06:BE6E28:E62E59:5E2BCF9E"
-    }
-  },
-  "uuid": "b8119a27-5fa5-406a-b5f6-c0d3a966b529",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-2",
-  "newScenarioState": "scenario-1-user-3",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8.json
new file mode 100644
index 0000000000..4f42762acf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamConnectionExceptions/mappings/user-8.json
@@ -0,0 +1,51 @@
+{
+  "id": "b8119a27-5fa5-406a-b5f6-c0d3a966b529",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-8.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4873",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEC4:4E06:BE6E28:E62E59:5E2BCF9E"
+    }
+  },
+  "uuid": "b8119a27-5fa5-406a-b5f6-c0d3a966b529",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-2",
+  "newScenarioState": "scenario-1-user-3",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/orgs_github-api-test-org-622cfe3b-ae86-4b2c-b2c3-97fc698c11a3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/orgs_github-api-test-org-622cfe3b-ae86-4b2c-b2c3-97fc698c11a3.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-5410872a-37cf-4246-acce-600f3271d30d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-5410872a-37cf-4246-acce-600f3271d30d.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-701c4dd4-9fd7-4318-b2fc-555134913ada.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-701c4dd4-9fd7-4318-b2fc-555134913ada.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-8ce0df73-96ad-4477-9ccf-5264e6e47d68.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-8ce0df73-96ad-4477-9ccf-5264e6e47d68.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/__files/user-5.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2-622cfe.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2-622cfe.json
deleted file mode 100644
index 8281b20b46..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2-622cfe.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "622cfe3b-ae86-4b2c-b2c3-97fc698c11a3",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-622cfe3b-ae86-4b2c-b2c3-97fc698c11a3.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:17:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "1579932374",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE45:1B3A:69A658:8035DE:5E2BCF67"
-    }
-  },
-  "uuid": "622cfe3b-ae86-4b2c-b2c3-97fc698c11a3",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..388cfb6ac8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "622cfe3b-ae86-4b2c-b2c3-97fc698c11a3",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:17:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "1579932374",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE45:1B3A:69A658:8035DE:5E2BCF67"
+    }
+  },
+  "uuid": "622cfe3b-ae86-4b2c-b2c3-97fc698c11a3",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-4-89ad96.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-4-89ad96.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-6-8ded92.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-6-8ded92.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/orgs_github-api-test-org-missing-6.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1-701c4d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1-701c4d.json
deleted file mode 100644
index a468fb7ff8..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1-701c4d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "701c4dd4-9fd7-4318-b2fc-555134913ada",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-701c4dd4-9fd7-4318-b2fc-555134913ada.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:17:27 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE45:1B3A:69A652:8035DB:5E2BCF67"
-    }
-  },
-  "uuid": "701c4dd4-9fd7-4318-b2fc-555134913ada",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-user-2",
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1.json
new file mode 100644
index 0000000000..e7acbda4aa
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-1.json
@@ -0,0 +1,51 @@
+{
+  "id": "701c4dd4-9fd7-4318-b2fc-555134913ada",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:17:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE45:1B3A:69A652:8035DB:5E2BCF67"
+    }
+  },
+  "uuid": "701c4dd4-9fd7-4318-b2fc-555134913ada",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-user-2",
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3-541087.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3-541087.json
deleted file mode 100644
index 404289de7d..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3-541087.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5410872a-37cf-4246-acce-600f3271d30d",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-5410872a-37cf-4246-acce-600f3271d30d.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:17:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE45:1B3A:69A65C:8035E4:5E2BCF68"
-    }
-  },
-  "uuid": "5410872a-37cf-4246-acce-600f3271d30d",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-2",
-  "newScenarioState": "scenario-1-user-3",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3.json
new file mode 100644
index 0000000000..5b0f0bdafc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "5410872a-37cf-4246-acce-600f3271d30d",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-3.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:17:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE45:1B3A:69A65C:8035E4:5E2BCF68"
+    }
+  },
+  "uuid": "5410872a-37cf-4246-acce-600f3271d30d",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-2",
+  "newScenarioState": "scenario-1-user-3",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5-8ce0df.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5-8ce0df.json
deleted file mode 100644
index 13b01fd5ee..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5-8ce0df.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "8ce0df73-96ad-4477-9ccf-5264e6e47d68",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-8ce0df73-96ad-4477-9ccf-5264e6e47d68.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:17:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4976",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FE45:1B3A:69A667:8035F4:5E2BCF68"
-    }
-  },
-  "uuid": "8ce0df73-96ad-4477-9ccf-5264e6e47d68",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5.json
new file mode 100644
index 0000000000..21103eeb6d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testInputStreamFailureExceptions/mappings/user-5.json
@@ -0,0 +1,50 @@
+{
+  "id": "8ce0df73-96ad-4477-9ccf-5264e6e47d68",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-5.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:17:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4976",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FE45:1B3A:69A667:8035F4:5E2BCF68"
+    }
+  },
+  "uuid": "8ce0df73-96ad-4477-9ccf-5264e6e47d68",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-06661cc8-79e8-4092-8d57-4971754c4f67.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-06661cc8-79e8-4092-8d57-4971754c4f67.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-10.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-2a62d2db-5cc9-4266-9859-95513efd4fea.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-2a62d2db-5cc9-4266-9859-95513efd4fea.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-12.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-2cd18bd9-8a1f-454d-be74-85611906796b.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-2cd18bd9-8a1f-454d-be74-85611906796b.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-13.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-466537f0-745f-41d3-a650-e4fcfbd59e65.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-466537f0-745f-41d3-a650-e4fcfbd59e65.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-15.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-553b71f9-eff3-45b8-ae76-833e137297ac.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-553b71f9-eff3-45b8-ae76-833e137297ac.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-5efe6d8a-e833-4fd9-9213-d3be1cfdabc7.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-5efe6d8a-e833-4fd9-9213-d3be1cfdabc7.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-62ca8648-119b-448f-86c6-97928378f834.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-62ca8648-119b-448f-86c6-97928378f834.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-5.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-8f46cc12-8654-414a-8706-8584aa642cd9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-8f46cc12-8654-414a-8706-8584aa642cd9.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-7.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-ff502c42-96ef-419d-b8d0-4381e1541b45.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-ff502c42-96ef-419d-b8d0-4381e1541b45.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/orgs_github-api-test-org-8.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-03f5d1e3-0add-4dac-9f9c-48145c86cec0.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-03f5d1e3-0add-4dac-9f9c-48145c86cec0.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-28c110e8-5558-4fc4-aee4-e5df36b88ce7.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-28c110e8-5558-4fc4-aee4-e5df36b88ce7.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-11.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-6e140e39-8c0e-41ef-83be-438d573acced.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-6e140e39-8c0e-41ef-83be-438d573acced.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-14.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-816c95a5-01d4-42ab-91cf-bd308ca9780b.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-816c95a5-01d4-42ab-91cf-bd308ca9780b.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-c3924d32-a472-4ec5-af6f-242f9529066c.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-c3924d32-a472-4ec5-af6f-242f9529066c.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-6.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/__files/user-9.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10-2cd18b.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10-2cd18b.json
deleted file mode 100644
index 7bf4eb479f..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10-2cd18b.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "2cd18bd9-8a1f-454d-be74-85611906796b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-2cd18bd9-8a1f-454d-be74-85611906796b.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4842",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC34C:8742EC:5E2BCFA6"
-    }
-  },
-  "uuid": "2cd18bd9-8a1f-454d-be74-85611906796b",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-6",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-7",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10.json
new file mode 100644
index 0000000000..3d7c6950bb
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-10.json
@@ -0,0 +1,51 @@
+{
+  "id": "2cd18bd9-8a1f-454d-be74-85611906796b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-10.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4842",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC34C:8742EC:5E2BCFA6"
+    }
+  },
+  "uuid": "2cd18bd9-8a1f-454d-be74-85611906796b",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-6",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-7",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12-5efe6d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12-5efe6d.json
deleted file mode 100644
index 7562671fcf..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12-5efe6d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "5efe6d8a-e833-4fd9-9213-d3be1cfdabc7",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5efe6d8a-e833-4fd9-9213-d3be1cfdabc7.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4840",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC360:8742FE:5E2BCFA7"
-    }
-  },
-  "uuid": "5efe6d8a-e833-4fd9-9213-d3be1cfdabc7",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-7",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-8",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12.json
new file mode 100644
index 0000000000..2ad7f64cff
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-12.json
@@ -0,0 +1,51 @@
+{
+  "id": "5efe6d8a-e833-4fd9-9213-d3be1cfdabc7",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-12.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4840",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC360:8742FE:5E2BCFA7"
+    }
+  },
+  "uuid": "5efe6d8a-e833-4fd9-9213-d3be1cfdabc7",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-7",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-8",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13-553b71.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13-553b71.json
deleted file mode 100644
index 2ee78be65c..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13-553b71.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "553b71f9-eff3-45b8-ae76-833e137297ac",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-553b71f9-eff3-45b8-ae76-833e137297ac.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4839",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC369:87430D:5E2BCFA7"
-    }
-  },
-  "uuid": "553b71f9-eff3-45b8-ae76-833e137297ac",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-8",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-9",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13.json
new file mode 100644
index 0000000000..6388e673fc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-13.json
@@ -0,0 +1,51 @@
+{
+  "id": "553b71f9-eff3-45b8-ae76-833e137297ac",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-13.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4839",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC369:87430D:5E2BCFA7"
+    }
+  },
+  "uuid": "553b71f9-eff3-45b8-ae76-833e137297ac",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-8",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-9",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15-2a62d2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15-2a62d2.json
deleted file mode 100644
index 2b32388b9a..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15-2a62d2.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "2a62d2db-5cc9-4266-9859-95513efd4fea",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-2a62d2db-5cc9-4266-9859-95513efd4fea.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4837",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC381:87432B:5E2BCFA8"
-    }
-  },
-  "uuid": "2a62d2db-5cc9-4266-9859-95513efd4fea",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-9",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15.json
new file mode 100644
index 0000000000..fd2661a57e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-15.json
@@ -0,0 +1,50 @@
+{
+  "id": "2a62d2db-5cc9-4266-9859-95513efd4fea",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-15.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4837",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC381:87432B:5E2BCFA8"
+    }
+  },
+  "uuid": "2a62d2db-5cc9-4266-9859-95513efd4fea",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-9",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2-62ca86.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2-62ca86.json
deleted file mode 100644
index 72c8d8814a..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2-62ca86.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "62ca8648-119b-448f-86c6-97928378f834",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-62ca8648-119b-448f-86c6-97928378f834.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4850",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC302:874296:5E2BCFA4"
-    }
-  },
-  "uuid": "62ca8648-119b-448f-86c6-97928378f834",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..5ff53497b8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,51 @@
+{
+  "id": "62ca8648-119b-448f-86c6-97928378f834",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4850",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC302:874296:5E2BCFA4"
+    }
+  },
+  "uuid": "62ca8648-119b-448f-86c6-97928378f834",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3-466537.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3-466537.json
deleted file mode 100644
index e091876019..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3-466537.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "466537f0-745f-41d3-a650-e4fcfbd59e65",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-466537f0-745f-41d3-a650-e4fcfbd59e65.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4849",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC30C:87429F:5E2BCFA4"
-    }
-  },
-  "uuid": "466537f0-745f-41d3-a650-e4fcfbd59e65",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-2",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-3",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..2feb3f8d92
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,51 @@
+{
+  "id": "466537f0-745f-41d3-a650-e4fcfbd59e65",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4849",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC30C:87429F:5E2BCFA4"
+    }
+  },
+  "uuid": "466537f0-745f-41d3-a650-e4fcfbd59e65",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-2",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-3",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5-ff502c.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5-ff502c.json
deleted file mode 100644
index c255ca6e20..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5-ff502c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "ff502c42-96ef-419d-b8d0-4381e1541b45",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-ff502c42-96ef-419d-b8d0-4381e1541b45.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4847",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC31A:8742B2:5E2BCFA5"
-    }
-  },
-  "uuid": "ff502c42-96ef-419d-b8d0-4381e1541b45",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-3",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-4",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5.json
new file mode 100644
index 0000000000..7262b59e5d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-5.json
@@ -0,0 +1,51 @@
+{
+  "id": "ff502c42-96ef-419d-b8d0-4381e1541b45",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-5.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4847",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC31A:8742B2:5E2BCFA5"
+    }
+  },
+  "uuid": "ff502c42-96ef-419d-b8d0-4381e1541b45",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-3",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-4",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7-06661c.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7-06661c.json
deleted file mode 100644
index 01349395fa..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7-06661c.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "06661cc8-79e8-4092-8d57-4971754c4f67",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-06661cc8-79e8-4092-8d57-4971754c4f67.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4845",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC32F:8742C3:5E2BCFA5"
-    }
-  },
-  "uuid": "06661cc8-79e8-4092-8d57-4971754c4f67",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-4",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-5",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7.json
new file mode 100644
index 0000000000..4c7133c1c8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-7.json
@@ -0,0 +1,51 @@
+{
+  "id": "06661cc8-79e8-4092-8d57-4971754c4f67",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-7.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4845",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC32F:8742C3:5E2BCFA5"
+    }
+  },
+  "uuid": "06661cc8-79e8-4092-8d57-4971754c4f67",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-4",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-5",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8-8f46cc.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8-8f46cc.json
deleted file mode 100644
index 3f56f6e5a8..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8-8f46cc.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "8f46cc12-8654-414a-8706-8584aa642cd9",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-8f46cc12-8654-414a-8706-8584aa642cd9.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4844",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC33C:8742D5:5E2BCFA6"
-    }
-  },
-  "uuid": "8f46cc12-8654-414a-8706-8584aa642cd9",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-5",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-6",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8.json
new file mode 100644
index 0000000000..679449d70e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/orgs_github-api-test-org-8.json
@@ -0,0 +1,51 @@
+{
+  "id": "8f46cc12-8654-414a-8706-8584aa642cd9",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-8.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4844",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC33C:8742D5:5E2BCFA6"
+    }
+  },
+  "uuid": "8f46cc12-8654-414a-8706-8584aa642cd9",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-5",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-6",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1-c3924d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1-c3924d.json
deleted file mode 100644
index 33ccff28f5..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1-c3924d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c3924d32-a472-4ec5-af6f-242f9529066c",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c3924d32-a472-4ec5-af6f-242f9529066c.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4851",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC2F9:874291:5E2BCFA4"
-    }
-  },
-  "uuid": "c3924d32-a472-4ec5-af6f-242f9529066c",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-user-2",
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1.json
new file mode 100644
index 0000000000..133155d8cf
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-1.json
@@ -0,0 +1,51 @@
+{
+  "id": "c3924d32-a472-4ec5-af6f-242f9529066c",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4851",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC2F9:874291:5E2BCFA4"
+    }
+  },
+  "uuid": "c3924d32-a472-4ec5-af6f-242f9529066c",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-user-2",
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11-03f5d1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11-03f5d1.json
deleted file mode 100644
index 403f642f75..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11-03f5d1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "03f5d1e3-0add-4dac-9f9c-48145c86cec0",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-03f5d1e3-0add-4dac-9f9c-48145c86cec0.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4841",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC352:8742F9:5E2BCFA7"
-    }
-  },
-  "uuid": "03f5d1e3-0add-4dac-9f9c-48145c86cec0",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-5",
-  "newScenarioState": "scenario-1-user-6",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11.json
new file mode 100644
index 0000000000..eabcc8b12b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-11.json
@@ -0,0 +1,51 @@
+{
+  "id": "03f5d1e3-0add-4dac-9f9c-48145c86cec0",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-11.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4841",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC352:8742F9:5E2BCFA7"
+    }
+  },
+  "uuid": "03f5d1e3-0add-4dac-9f9c-48145c86cec0",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-5",
+  "newScenarioState": "scenario-1-user-6",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14-d81fbd.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14-d81fbd.json
deleted file mode 100644
index 7c431ed30f..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14-d81fbd.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:32 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4838",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC375:874321:5E2BCFA8"
-    }
-  },
-  "uuid": "d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-6",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14.json
new file mode 100644
index 0000000000..166d1fd8de
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-14.json
@@ -0,0 +1,50 @@
+{
+  "id": "d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-14.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4838",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC375:874321:5E2BCFA8"
+    }
+  },
+  "uuid": "d81fbdd1-40ad-4b9e-b3a1-80d3b86455a2",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-6",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4-816c95.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4-816c95.json
deleted file mode 100644
index fc57e2f205..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4-816c95.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "816c95a5-01d4-42ab-91cf-bd308ca9780b",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-816c95a5-01d4-42ab-91cf-bd308ca9780b.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4848",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC311:8742AB:5E2BCFA5"
-    }
-  },
-  "uuid": "816c95a5-01d4-42ab-91cf-bd308ca9780b",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-2",
-  "newScenarioState": "scenario-1-user-3",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4.json
new file mode 100644
index 0000000000..0040d98bb7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-4.json
@@ -0,0 +1,51 @@
+{
+  "id": "816c95a5-01d4-42ab-91cf-bd308ca9780b",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-4.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4848",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC311:8742AB:5E2BCFA5"
+    }
+  },
+  "uuid": "816c95a5-01d4-42ab-91cf-bd308ca9780b",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-2",
+  "newScenarioState": "scenario-1-user-3",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6-28c110.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6-28c110.json
deleted file mode 100644
index 5fe1ef6714..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6-28c110.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "28c110e8-5558-4fc4-aee4-e5df36b88ce7",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-28c110e8-5558-4fc4-aee4-e5df36b88ce7.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4846",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC321:8742BC:5E2BCFA5"
-    }
-  },
-  "uuid": "28c110e8-5558-4fc4-aee4-e5df36b88ce7",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-3",
-  "newScenarioState": "scenario-1-user-4",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6.json
new file mode 100644
index 0000000000..c4c6ade592
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-6.json
@@ -0,0 +1,51 @@
+{
+  "id": "28c110e8-5558-4fc4-aee4-e5df36b88ce7",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-6.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4846",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC321:8742BC:5E2BCFA5"
+    }
+  },
+  "uuid": "28c110e8-5558-4fc4-aee4-e5df36b88ce7",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-3",
+  "newScenarioState": "scenario-1-user-4",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9-6e140e.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9-6e140e.json
deleted file mode 100644
index 428e048e77..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9-6e140e.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "6e140e39-8c0e-41ef-83be-438d573acced",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-6e140e39-8c0e-41ef-83be-438d573acced.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4843",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEE5:85F1:6FC343:8742E7:5E2BCFA6"
-    }
-  },
-  "uuid": "6e140e39-8c0e-41ef-83be-438d573acced",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-4",
-  "newScenarioState": "scenario-1-user-5",
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9.json
new file mode 100644
index 0000000000..ff6857bbab
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeConnectionExceptions/mappings/user-9.json
@@ -0,0 +1,51 @@
+{
+  "id": "6e140e39-8c0e-41ef-83be-438d573acced",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-9.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4843",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEE5:85F1:6FC343:8742E7:5E2BCFA6"
+    }
+  },
+  "uuid": "6e140e39-8c0e-41ef-83be-438d573acced",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-4",
+  "newScenarioState": "scenario-1-user-5",
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-b23279af-42c2-47ec-8cd5-d0e539893e37.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-b23279af-42c2-47ec-8cd5-d0e539893e37.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-c4f47d35-3379-4ed9-ab34-8cf9d6bdf278.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-c4f47d35-3379-4ed9-ab34-8cf9d6bdf278.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/orgs_github-api-test-org-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-6e1f2378-989b-4c01-942b-1dbe62c37828.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-6e1f2378-989b-4c01-942b-1dbe62c37828.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-ec7ea0b8-43cf-453d-93f3-3a95646e5e49.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-ec7ea0b8-43cf-453d-93f3-3a95646e5e49.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/__files/user-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2-c4f47d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2-c4f47d.json
deleted file mode 100644
index afbda24de2..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2-c4f47d.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "c4f47d35-3379-4ed9-ab34-8cf9d6bdf278",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-c4f47d35-3379-4ed9-ab34-8cf9d6bdf278.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4885",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB5:19C3:CCCEB0:F75891:5E2BCF9B"
-    }
-  },
-  "uuid": "c4f47d35-3379-4ed9-ab34-8cf9d6bdf278",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-orgs-github-api-test-org-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..46e8cf5dc6
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,51 @@
+{
+  "id": "c4f47d35-3379-4ed9-ab34-8cf9d6bdf278",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4885",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB5:19C3:CCCEB0:F75891:5E2BCF9B"
+    }
+  },
+  "uuid": "c4f47d35-3379-4ed9-ab34-8cf9d6bdf278",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-orgs-github-api-test-org-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4-b23279.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4-b23279.json
deleted file mode 100644
index 99beefd92d..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4-b23279.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "b23279af-42c2-47ec-8cd5-d0e539893e37",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-b23279af-42c2-47ec-8cd5-d0e539893e37.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4883",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB5:19C3:CCCEC3:F758AC:5E2BCF9C"
-    }
-  },
-  "uuid": "b23279af-42c2-47ec-8cd5-d0e539893e37",
-  "persistent": true,
-  "scenarioName": "scenario-2-orgs-github-api-test-org",
-  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4.json
new file mode 100644
index 0000000000..a5edb05d7e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/orgs_github-api-test-org-4.json
@@ -0,0 +1,50 @@
+{
+  "id": "b23279af-42c2-47ec-8cd5-d0e539893e37",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-4.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4883",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0dfdf14c762767b64d42a9944f82d6ea\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB5:19C3:CCCEC3:F758AC:5E2BCF9C"
+    }
+  },
+  "uuid": "b23279af-42c2-47ec-8cd5-d0e539893e37",
+  "persistent": true,
+  "scenarioName": "scenario-2-orgs-github-api-test-org",
+  "requiredScenarioState": "scenario-2-orgs-github-api-test-org-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1-6e1f23.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1-6e1f23.json
deleted file mode 100644
index 09b953f41f..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1-6e1f23.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "6e1f2378-989b-4c01-942b-1dbe62c37828",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-6e1f2378-989b-4c01-942b-1dbe62c37828.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:19 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4886",
-      "X-RateLimit-Reset": "1579932373",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB5:19C3:CCCE98:F75886:5E2BCF9B"
-    }
-  },
-  "uuid": "6e1f2378-989b-4c01-942b-1dbe62c37828",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-user-2",
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1.json
new file mode 100644
index 0000000000..9849069591
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-1.json
@@ -0,0 +1,51 @@
+{
+  "id": "6e1f2378-989b-4c01-942b-1dbe62c37828",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:19 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4886",
+      "X-RateLimit-Reset": "1579932373",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB5:19C3:CCCE98:F75886:5E2BCF9B"
+    }
+  },
+  "uuid": "6e1f2378-989b-4c01-942b-1dbe62c37828",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-user-2",
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3-ec7ea0.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3-ec7ea0.json
deleted file mode 100644
index 641a955946..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3-ec7ea0.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ec7ea0b8-43cf-453d-93f3-3a95646e5e49",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ec7ea0b8-43cf-453d-93f3-3a95646e5e49.json",
-    "headers": {
-      "Date": "Sat, 25 Jan 2020 05:18:20 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4884",
-      "X-RateLimit-Reset": "1579932374",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
-      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FEB5:19C3:CCCEB9:F758A3:5E2BCF9B"
-    }
-  },
-  "uuid": "ec7ea0b8-43cf-453d-93f3-3a95646e5e49",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-2",
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3.json
new file mode 100644
index 0000000000..314c99af96
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testResponseCodeFailureExceptions/mappings/user-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "ec7ea0b8-43cf-453d-93f3-3a95646e5e49",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-3.json",
+    "headers": {
+      "Date": "Sat, 25 Jan 2020 05:18:20 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4884",
+      "X-RateLimit-Reset": "1579932374",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4a9f18eb2c9699f7dcac048f56ae5d0\"",
+      "Last-Modified": "Thu, 23 Jan 2020 23:40:57 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FEB5:19C3:CCCEB9:F758A3:5E2BCF9B"
+    }
+  },
+  "uuid": "ec7ea0b8-43cf-453d-93f3-3a95646e5e49",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-2",
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api_branches_test_timeout-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/repos_github-api-test-org_github-api_branches_test_timeout-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2-5e8ae8.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2-5e8ae8.json
deleted file mode 100644
index 6383a4eae5..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2-5e8ae8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
-    }
-  },
-  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..cfe78feffc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
+    }
+  },
+  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3-30364e.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3-30364e.json
deleted file mode 100644
index dda61603aa..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3-30364e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
-      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
-    }
-  },
-  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..3584665077
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
+      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
+    }
+  },
+  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
deleted file mode 100644
index 5d24c0f050..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "name": "repos_github-api-test-org_github-api_branches_test_timeout",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/branches/test/timeout",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
-    }
-  },
-  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
new file mode 100644
index 0000000000..37b685b0d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "name": "repos_github-api-test-org_github-api_branches_test_timeout",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/branches/test/timeout",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_timeout-4.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
+    }
+  },
+  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1-c92cdb.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1-c92cdb.json
deleted file mode 100644
index 70c3d22112..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1-c92cdb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
-    }
-  },
-  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1.json
new file mode 100644
index 0000000000..b0454fd367
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
+    }
+  },
+  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api_branches_test_timeout-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/repos_github-api-test-org_github-api_branches_test_timeout-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2-5e8ae8.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2-5e8ae8.json
deleted file mode 100644
index 6383a4eae5..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2-5e8ae8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
-    }
-  },
-  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..cfe78feffc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
+    }
+  },
+  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3-30364e.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3-30364e.json
deleted file mode 100644
index dda61603aa..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3-30364e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
-      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
-    }
-  },
-  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..3584665077
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
+      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
+    }
+  },
+  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
deleted file mode 100644
index 5d24c0f050..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "name": "repos_github-api-test-org_github-api_branches_test_timeout",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/branches/test/timeout",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
-    }
-  },
-  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
new file mode 100644
index 0000000000..37b685b0d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "name": "repos_github-api-test-org_github-api_branches_test_timeout",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/branches/test/timeout",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_timeout-4.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
+    }
+  },
+  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1-c92cdb.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1-c92cdb.json
deleted file mode 100644
index 70c3d22112..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1-c92cdb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
-    }
-  },
-  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1.json
new file mode 100644
index 0000000000..b0454fd367
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_StatusCode/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
+    }
+  },
+  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/orgs_github-api-test-org-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/orgs_github-api-test-org-2.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api-3.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api_branches_test_timeout-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/repos_github-api-test-org_github-api_branches_test_timeout-4.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json
rename to src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2-5e8ae8.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2-5e8ae8.json
deleted file mode 100644
index 6383a4eae5..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2-5e8ae8.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
-    }
-  },
-  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2.json
new file mode 100644
index 0000000000..cfe78feffc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/orgs_github-api-test-org-2.json
@@ -0,0 +1,48 @@
+{
+  "id": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-2.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b7989d48e6539c9c76038995b902421b\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DB:2A314B:5D8C0218"
+    }
+  },
+  "uuid": "5e8ae8ed-0988-4df2-89d3-eda4c6bdc60d",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3-30364e.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3-30364e.json
deleted file mode 100644
index dda61603aa..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3-30364e.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-30364e1b-193c-4929-9dd0-5aab7b47dbb9.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
-      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
-    }
-  },
-  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3.json
new file mode 100644
index 0000000000..3584665077
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-3.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"afa5bdcd11463905460dc32b4cbac3ba\"",
+      "Last-Modified": "Wed, 25 Sep 2019 23:37:07 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322DE:2A315A:5D8C0218"
+    }
+  },
+  "uuid": "30364e1b-193c-4929-9dd0-5aab7b47dbb9",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
deleted file mode 100644
index 5d24c0f050..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4-ed8bf5.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "name": "repos_github-api-test-org_github-api_branches_test_timeout",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/branches/test/timeout",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_timeout-ed8bf5ba-65e0-47d8-bb4d-614063828c87.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
-    }
-  },
-  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
new file mode 100644
index 0000000000..37b685b0d8
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/repos_github-api-test-org_github-api_branches_test_timeout-4.json
@@ -0,0 +1,47 @@
+{
+  "id": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "name": "repos_github-api-test-org_github-api_branches_test_timeout",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/branches/test/timeout",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api_branches_test_timeout-4.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:05 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"70021000b4de67768f66b57bbeead27c\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322E4:2A3160:5D8C0219"
+    }
+  },
+  "uuid": "ed8bf5ba-65e0-47d8-bb4d-614063828c87",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1-c92cdb.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1-c92cdb.json
deleted file mode 100644
index 70c3d22112..0000000000
--- a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1-c92cdb.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc.json",
-    "headers": {
-      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "1569460192",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
-    }
-  },
-  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1.json b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1.json
new file mode 100644
index 0000000000..b0454fd367
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/RequesterRetryTest/wiremock/testSocketConnectionAndRetry_Success/mappings/user-1.json
@@ -0,0 +1,48 @@
+{
+  "id": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Thu, 26 Sep 2019 00:11:04 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "1569460192",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"14ffd29009ddc2209c450bb29a5a8330\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FD24:3764:2322CA:2A3143:5D8C0218"
+    }
+  },
+  "uuid": "c92cdb3f-7cae-43ba-bee2-e5aa6863dcbc",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/repos_github-api_github-api-0a34447d-6390-42da-ad5b-25bb566547f0.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/repos_github-api_github-api-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/repos_github-api_github-api-0a34447d-6390-42da-ad5b-25bb566547f0.json
rename to src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/repos_github-api_github-api-2.json
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/user-b4b6d514-c9e8-488f-802f-35e51d3ba5b3.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/user-b4b6d514-c9e8-488f-802f-35e51d3ba5b3.json
rename to src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2-0a3444.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2-0a3444.json
deleted file mode 100644
index 2f4e8273aa..0000000000
--- a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2-0a3444.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "0a34447d-6390-42da-ad5b-25bb566547f0",
-  "name": "repos_github-api_github-api",
-  "request": {
-    "url": "/repos/github-api/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api_github-api-0a34447d-6390-42da-ad5b-25bb566547f0.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 21:36:30 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "1568068520",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4e3dd7308c6c7e9e08b7a9000e0fbfdd\"",
-      "Last-Modified": "Sat, 07 Sep 2019 00:07:16 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DF6D:7CF5:CA117:F0DAF:5D76C5DD"
-    }
-  },
-  "uuid": "0a34447d-6390-42da-ad5b-25bb566547f0",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2.json
new file mode 100644
index 0000000000..8c69f0ea47
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/repos_github-api_github-api-2.json
@@ -0,0 +1,43 @@
+{
+  "id": "0a34447d-6390-42da-ad5b-25bb566547f0",
+  "name": "repos_github-api_github-api",
+  "request": {
+    "url": "/repos/github-api/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api_github-api-2.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 21:36:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "1568068520",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4e3dd7308c6c7e9e08b7a9000e0fbfdd\"",
+      "Last-Modified": "Sat, 07 Sep 2019 00:07:16 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DF6D:7CF5:CA117:F0DAF:5D76C5DD"
+    }
+  },
+  "uuid": "0a34447d-6390-42da-ad5b-25bb566547f0",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1-b4b6d5.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1-b4b6d5.json
deleted file mode 100644
index b1eda52765..0000000000
--- a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1-b4b6d5.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "b4b6d514-c9e8-488f-802f-35e51d3ba5b3",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b4b6d514-c9e8-488f-802f-35e51d3ba5b3.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 21:36:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4971",
-      "X-RateLimit-Reset": "1568068520",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DF6D:7CF5:CA101:F0DA8:5D76C5DD"
-    }
-  },
-  "uuid": "b4b6d514-c9e8-488f-802f-35e51d3ba5b3",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1.json
new file mode 100644
index 0000000000..90ae18c234
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/BasicBehaviors_whenProxying/mappings/user-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "b4b6d514-c9e8-488f-802f-35e51d3ba5b3",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 21:36:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4971",
+      "X-RateLimit-Reset": "1568068520",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DF6D:7CF5:CA101:F0DA8:5D76C5DD"
+    }
+  },
+  "uuid": "b4b6d514-c9e8-488f-802f-35e51d3ba5b3",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/__files/user-67d218ce-0abd-4a0a-98ea-626565e977ca.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/__files/user-67d218ce-0abd-4a0a-98ea-626565e977ca.json
rename to src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1-67d218.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1-67d218.json
deleted file mode 100644
index 96d469df22..0000000000
--- a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1-67d218.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "67d218ce-0abd-4a0a-98ea-626565e977ca",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-67d218ce-0abd-4a0a-98ea-626565e977ca.json",
-    "headers": {
-      "Date": "Mon, 09 Sep 2019 21:24:28 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "1568067845",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
-      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
-      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "DEFC:7CF6:1726A3:1B693D:5D76C30C"
-    }
-  },
-  "uuid": "67d218ce-0abd-4a0a-98ea-626565e977ca",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1.json b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1.json
new file mode 100644
index 0000000000..0452a39dae
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/WireMockStatusReporterTest/wiremock/user_whenNotProxying_Stubbed/mappings/user-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "67d218ce-0abd-4a0a-98ea-626565e977ca",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 09 Sep 2019 21:24:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "1568067845",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"3ba1de3523043df743651bd23efc7def\"",
+      "Last-Modified": "Mon, 03 Jun 2019 17:47:20 GMT",
+      "X-OAuth-Scopes": "delete_repo, gist, notifications, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "DEFC:7CF6:1726A3:1B693D:5D76C30C"
+    }
+  },
+  "uuid": "67d218ce-0abd-4a0a-98ea-626565e977ca",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/repos_github-api-test-org_github-api_git_refs-12.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/__files/user-2.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3-18671a.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3-18671a.json
deleted file mode 100644
index 066a1a4a34..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3-18671a.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "18671a38-8d77-4242-9519-3503350cf496",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET",
-    "headers": {
-      "Cache-Control": {
-        "equalTo": "max-age=0"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-18671a38-8d77-4242-9519-3503350cf496.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4854",
-      "X-RateLimit-Reset": "1579305892",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"9ca1045afd5fa137ad6fc6dfe5db2c61\"",
-      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF0:630F:78316:93BAD:5E224617"
-    }
-  },
-  "uuid": "18671a38-8d77-4242-9519-3503350cf496",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..efd4f797ea
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,48 @@
+{
+  "id": "18671a38-8d77-4242-9519-3503350cf496",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET",
+    "headers": {
+      "Cache-Control": {
+        "equalTo": "max-age=0"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4854",
+      "X-RateLimit-Reset": "1579305892",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9ca1045afd5fa137ad6fc6dfe5db2c61\"",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF0:630F:78316:93BAD:5E224617"
+    }
+  },
+  "uuid": "18671a38-8d77-4242-9519-3503350cf496",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4-dac6a9.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4-dac6a9.json
deleted file mode 100644
index f7143f109b..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4-dac6a9.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "id": "dac6a9c8-632c-4fe0-8f83-a79f1c361f46",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "Cache-Control": {
-        "equalTo": "max-age=0"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-dac6a9c8-632c-4fe0-8f83-a79f1c361f46.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4853",
-      "X-RateLimit-Reset": "1579305892",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"0f1ad6f5c0e7456ad30a6f40808e8d8d\"",
-      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF0:630F:78324:93BBD:5E224617"
-    }
-  },
-  "uuid": "dac6a9c8-632c-4fe0-8f83-a79f1c361f46",
-  "persistent": true,
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4.json
new file mode 100644
index 0000000000..8661cd3548
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api-4.json
@@ -0,0 +1,48 @@
+{
+  "id": "dac6a9c8-632c-4fe0-8f83-a79f1c361f46",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "Cache-Control": {
+        "equalTo": "max-age=0"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4853",
+      "X-RateLimit-Reset": "1579305892",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0f1ad6f5c0e7456ad30a6f40808e8d8d\"",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF0:630F:78324:93BBD:5E224617"
+    }
+  },
+  "uuid": "dac6a9c8-632c-4fe0-8f83-a79f1c361f46",
+  "persistent": true,
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json
deleted file mode 100644
index 9a3ec7d2b4..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12-ae6bc9.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "id": "ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a",
-  "name": "repos_github-api-test-org_github-api_git_refs",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api/git/refs",
-    "method": "POST",
-    "headers": {
-      "Cache-Control": {
-        "equalTo": "max-age=0"
-      }
-    },
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"ref\":\"refs/heads/test/content_ref_cache\",\"sha\":\"d4080cf9e2fa0959966d201f3dd60105fdf5bd97\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 201,
-    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "201 Created",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4846",
-      "X-RateLimit-Reset": "1579305892",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "\"d3be5b35b8d84ef7ac03c0cc9c94ed81\"",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/heads/test/content_ref_cache",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF0:630F:784B2:93D10:5E22461C"
-    }
-  },
-  "uuid": "ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a",
-  "persistent": true,
-  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-git-refs",
-  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-git-refs-2",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12.json
new file mode 100644
index 0000000000..4e2547cfcc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-12.json
@@ -0,0 +1,57 @@
+{
+  "id": "ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a",
+  "name": "repos_github-api-test-org_github-api_git_refs",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api/git/refs",
+    "method": "POST",
+    "headers": {
+      "Cache-Control": {
+        "equalTo": "max-age=0"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"ref\":\"refs/heads/test/content_ref_cache\",\"sha\":\"d4080cf9e2fa0959966d201f3dd60105fdf5bd97\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "repos_github-api-test-org_github-api_git_refs-12.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4846",
+      "X-RateLimit-Reset": "1579305892",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"d3be5b35b8d84ef7ac03c0cc9c94ed81\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "Location": "https://api.github.com/repos/github-api-test-org/github-api/git/refs/heads/test/content_ref_cache",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF0:630F:784B2:93D10:5E22461C"
+    }
+  },
+  "uuid": "ae6bc9aa-4a6b-4022-87ea-c545ee0c7c0a",
+  "persistent": true,
+  "scenarioName": "scenario-2-repos-github-api-test-org-github-api-git-refs",
+  "requiredScenarioState": "scenario-2-repos-github-api-test-org-github-api-git-refs-2",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6-d5310e.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs-6.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10-05226c.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-10.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11-6e1f95.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-11.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13-60a342.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-13.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14-709410.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-14.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15-eea55a.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-15.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7-396478.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-7.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8-4506da.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-8.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9-fc958c.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_content_ref_cache-9.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5-d47b33.json
rename to src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/repos_github-api-test-org_github-api_git_refs_heads_test_unmergeable-5.json
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1-0e4fff.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1-0e4fff.json
deleted file mode 100644
index 9f005d22c3..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1-0e4fff.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "0e4fff19-acf2-4b5d-863e-ac84adf7a090",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Cache-Control": {
-        "equalTo": "max-age=0"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-0e4fff19-acf2-4b5d-863e-ac84adf7a090.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4856",
-      "X-RateLimit-Reset": "1579305892",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a4673e01225cb4bf682d7083a10d8d0f\"",
-      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF0:630F:782F5:93B86:5E224616"
-    }
-  },
-  "uuid": "0e4fff19-acf2-4b5d-863e-ac84adf7a090",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-user-2",
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1.json
new file mode 100644
index 0000000000..8679ae6ea0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-1.json
@@ -0,0 +1,51 @@
+{
+  "id": "0e4fff19-acf2-4b5d-863e-ac84adf7a090",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Cache-Control": {
+        "equalTo": "max-age=0"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4856",
+      "X-RateLimit-Reset": "1579305892",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a4673e01225cb4bf682d7083a10d8d0f\"",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF0:630F:782F5:93B86:5E224616"
+    }
+  },
+  "uuid": "0e4fff19-acf2-4b5d-863e-ac84adf7a090",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-user-2",
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2-ba9eb8.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2-ba9eb8.json
deleted file mode 100644
index affe0b1e24..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2-ba9eb8.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "id": "ba9eb87b-ec27-4a38-9faf-f238b715e9ac",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET",
-    "headers": {
-      "Cache-Control": {
-        "equalTo": "max-age=0"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-ba9eb87b-ec27-4a38-9faf-f238b715e9ac.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4855",
-      "X-RateLimit-Reset": "1579305892",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"a4673e01225cb4bf682d7083a10d8d0f\"",
-      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF0:630F:78309:93B90:5E224616"
-    }
-  },
-  "uuid": "ba9eb87b-ec27-4a38-9faf-f238b715e9ac",
-  "persistent": true,
-  "scenarioName": "scenario-1-user",
-  "requiredScenarioState": "scenario-1-user-2",
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2.json b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2.json
new file mode 100644
index 0000000000..beee537b83
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/GitHubCachingTest/wiremock/testCached404/mappings/user-2.json
@@ -0,0 +1,50 @@
+{
+  "id": "ba9eb87b-ec27-4a38-9faf-f238b715e9ac",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Cache-Control": {
+        "equalTo": "max-age=0"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-2.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4855",
+      "X-RateLimit-Reset": "1579305892",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"a4673e01225cb4bf682d7083a10d8d0f\"",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CAF0:630F:78309:93B90:5E224616"
+    }
+  },
+  "uuid": "ba9eb87b-ec27-4a38-9faf-f238b715e9ac",
+  "persistent": true,
+  "scenarioName": "scenario-1-user",
+  "requiredScenarioState": "scenario-1-user-2",
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/orgs_github-api-test-org-735e8274-2b9f-4e56-b7eb-efb51671aa16.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/orgs_github-api-test-org-735e8274-2b9f-4e56-b7eb-efb51671aa16.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/rate_limit-56a45440-7250-4615-9e39-f32ed5f24d40.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/rate_limit-56a45440-7250-4615-9e39-f32ed5f24d40.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-06582096-97d7-484a-9f75-97f38540d4ba.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-06582096-97d7-484a-9f75-97f38540d4ba.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-10.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-52d2b85d-6f62-441f-9c39-f8431db45130.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-52d2b85d-6f62-441f-9c39-f8431db45130.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-11.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-931c2ba3-3b54-426d-a611-5c8a8dc7e400.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-931c2ba3-3b54-426d-a611-5c8a8dc7e400.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-12.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-af0497da-2a7b-46d0-9dc0-8feddfc9dc6c.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-af0497da-2a7b-46d0-9dc0-8feddfc9dc6c.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-13.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-1ed5a89a-3504-4e58-8feb-36ea82bc0fc6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-1ed5a89a-3504-4e58-8feb-36ea82bc0fc6.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-14.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-b529a21c-daaa-49ea-80ad-5d67b3c1a6fb.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-b529a21c-daaa-49ea-80ad-5d67b3c1a6fb.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-15.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-cec25305-37b3-4ab0-a5ba-2f7513798ed1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-cec25305-37b3-4ab0-a5ba-2f7513798ed1.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-16.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-e79386f9-0358-4760-af21-eefcff4a37c8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-e79386f9-0358-4760-af21-eefcff4a37c8.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-17.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-1f9c125d-f4b9-4cf2-a577-db6653212d6a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-1f9c125d-f4b9-4cf2-a577-db6653212d6a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-5f00134d-2aea-477a-8bcc-eddf19710263.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-5f00134d-2aea-477a-8bcc-eddf19710263.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-bcd9c446-f8cb-4092-a284-5009153aed91.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-bcd9c446-f8cb-4092-a284-5009153aed91.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-cafca820-5725-492f-abaf-12b2c96adbc6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-cafca820-5725-492f-abaf-12b2c96adbc6.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-ce1bc2f8-f17e-463b-a950-02487f6d5dbe.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-ce1bc2f8-f17e-463b-a950-02487f6d5dbe.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-8.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-ca8e64d2-a8af-4c75-af59-63b51e2eb716.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-ca8e64d2-a8af-4c75-af59-63b51e2eb716.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/user-b5238674-bdba-4cb5-ae17-49108689843a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/user-b5238674-bdba-4cb5-ae17-49108689843a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3-735e82.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3-735e82.json
deleted file mode 100644
index dfad373d05..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3-735e82.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "735e8274-2b9f-4e56-b7eb-efb51671aa16",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-735e8274-2b9f-4e56-b7eb-efb51671aa16.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4716",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"daa553b1db7b807d5eafb289f3b6b214\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696DAE:1AB3F7C:5D923372"
-    }
-  },
-  "uuid": "735e8274-2b9f-4e56-b7eb-efb51671aa16",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..d20657c11d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,43 @@
+{
+  "id": "735e8274-2b9f-4e56-b7eb-efb51671aa16",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4716",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"daa553b1db7b807d5eafb289f3b6b214\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696DAE:1AB3F7C:5D923372"
+    }
+  },
+  "uuid": "735e8274-2b9f-4e56-b7eb-efb51671aa16",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2-56a454.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2-56a454.json
deleted file mode 100644
index 550d8563a1..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2-56a454.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "56a45440-7250-4615-9e39-f32ed5f24d40",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-56a45440-7250-4615-9e39-f32ed5f24d40.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4717",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696D98:1AB3F33:5D923372"
-    }
-  },
-  "uuid": "56a45440-7250-4615-9e39-f32ed5f24d40",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..a9808882b4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/rate_limit-2.json
@@ -0,0 +1,38 @@
+{
+  "id": "56a45440-7250-4615-9e39-f32ed5f24d40",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4717",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696D98:1AB3F33:5D923372"
+    }
+  },
+  "uuid": "56a45440-7250-4615-9e39-f32ed5f24d40",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10-ca8e64.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10-ca8e64.json
deleted file mode 100644
index 90694b2655..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10-ca8e64.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "ca8e64d2-a8af-4c75-af59-63b51e2eb716",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ca8e64d2-a8af-4c75-af59-63b51e2eb716.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:23 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4709",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:16972CC:1AB4544:5D92337A"
-    }
-  },
-  "uuid": "ca8e64d2-a8af-4c75-af59-63b51e2eb716",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10.json
new file mode 100644
index 0000000000..22f5c68080
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-10.json
@@ -0,0 +1,46 @@
+{
+  "id": "ca8e64d2-a8af-4c75-af59-63b51e2eb716",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-10.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:23 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4709",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:16972CC:1AB4544:5D92337A"
+    }
+  },
+  "uuid": "ca8e64d2-a8af-4c75-af59-63b51e2eb716",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11-065820.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11-065820.json
deleted file mode 100644
index 6de302112d..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11-065820.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "06582096-97d7-484a-9f75-97f38540d4ba",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-06582096-97d7-484a-9f75-97f38540d4ba.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:24 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4708",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1697347:1AB45A2:5D92337B"
-    }
-  },
-  "uuid": "06582096-97d7-484a-9f75-97f38540d4ba",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11.json
new file mode 100644
index 0000000000..cd56b0a73a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-11.json
@@ -0,0 +1,46 @@
+{
+  "id": "06582096-97d7-484a-9f75-97f38540d4ba",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-11.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:24 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4708",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1697347:1AB45A2:5D92337B"
+    }
+  },
+  "uuid": "06582096-97d7-484a-9f75-97f38540d4ba",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12-af0497.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12-af0497.json
deleted file mode 100644
index 8987c2308b..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12-af0497.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "af0497da-2a7b-46d0-9dc0-8feddfc9dc6c",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-af0497da-2a7b-46d0-9dc0-8feddfc9dc6c.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:25 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4707",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:169740C:1AB4620:5D92337C"
-    }
-  },
-  "uuid": "af0497da-2a7b-46d0-9dc0-8feddfc9dc6c",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12.json
new file mode 100644
index 0000000000..c013fd7521
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-12.json
@@ -0,0 +1,46 @@
+{
+  "id": "af0497da-2a7b-46d0-9dc0-8feddfc9dc6c",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-12.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:25 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4707",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:169740C:1AB4620:5D92337C"
+    }
+  },
+  "uuid": "af0497da-2a7b-46d0-9dc0-8feddfc9dc6c",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13-52d2b8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13-52d2b8.json
deleted file mode 100644
index d49e426160..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13-52d2b8.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "52d2b85d-6f62-441f-9c39-f8431db45130",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-52d2b85d-6f62-441f-9c39-f8431db45130.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:29 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4706",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:169768A:1AB46F5:5D92337D"
-    }
-  },
-  "uuid": "52d2b85d-6f62-441f-9c39-f8431db45130",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13.json
new file mode 100644
index 0000000000..052088ae16
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-13.json
@@ -0,0 +1,46 @@
+{
+  "id": "52d2b85d-6f62-441f-9c39-f8431db45130",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-13.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4706",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:22 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:169768A:1AB46F5:5D92337D"
+    }
+  },
+  "uuid": "52d2b85d-6f62-441f-9c39-f8431db45130",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14-cec253.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14-cec253.json
deleted file mode 100644
index 12c9b19b1e..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14-cec253.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "cec25305-37b3-4ab0-a5ba-2f7513798ed1",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-cec25305-37b3-4ab0-a5ba-2f7513798ed1.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4703",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:169774B:1AB49E3:5D923381"
-    }
-  },
-  "uuid": "cec25305-37b3-4ab0-a5ba-2f7513798ed1",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14.json
new file mode 100644
index 0000000000..4b3676ad17
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-14.json
@@ -0,0 +1,46 @@
+{
+  "id": "cec25305-37b3-4ab0-a5ba-2f7513798ed1",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-14.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4703",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:169774B:1AB49E3:5D923381"
+    }
+  },
+  "uuid": "cec25305-37b3-4ab0-a5ba-2f7513798ed1",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15-1ed5a8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15-1ed5a8.json
deleted file mode 100644
index 967b48f0e6..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15-1ed5a8.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "1ed5a89a-3504-4e58-8feb-36ea82bc0fc6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1ed5a89a-3504-4e58-8feb-36ea82bc0fc6.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:31 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4702",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:16977C7:1AB4ACB:5D923383"
-    }
-  },
-  "uuid": "1ed5a89a-3504-4e58-8feb-36ea82bc0fc6",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15.json
new file mode 100644
index 0000000000..d65afe02d7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-15.json
@@ -0,0 +1,46 @@
+{
+  "id": "1ed5a89a-3504-4e58-8feb-36ea82bc0fc6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-15.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4702",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:16977C7:1AB4ACB:5D923383"
+    }
+  },
+  "uuid": "1ed5a89a-3504-4e58-8feb-36ea82bc0fc6",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16-b529a2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16-b529a2.json
deleted file mode 100644
index 264db72212..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16-b529a2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "b529a21c-daaa-49ea-80ad-5d67b3c1a6fb",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-b529a21c-daaa-49ea-80ad-5d67b3c1a6fb.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:33 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4701",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1697879:1AB4B59:5D923383"
-    }
-  },
-  "uuid": "b529a21c-daaa-49ea-80ad-5d67b3c1a6fb",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16.json
new file mode 100644
index 0000000000..bc9620b0dd
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-16.json
@@ -0,0 +1,46 @@
+{
+  "id": "b529a21c-daaa-49ea-80ad-5d67b3c1a6fb",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-16.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4701",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1697879:1AB4B59:5D923383"
+    }
+  },
+  "uuid": "b529a21c-daaa-49ea-80ad-5d67b3c1a6fb",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17-e79386.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17-e79386.json
deleted file mode 100644
index f0fa51b7aa..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17-e79386.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "e79386f9-0358-4760-af21-eefcff4a37c8",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-e79386f9-0358-4760-af21-eefcff4a37c8.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:37 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4700",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1697A9D:1AB4C23:5D923385"
-    }
-  },
-  "uuid": "e79386f9-0358-4760-af21-eefcff4a37c8",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17.json
new file mode 100644
index 0000000000..92201d08b2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-17.json
@@ -0,0 +1,45 @@
+{
+  "id": "e79386f9-0358-4760-af21-eefcff4a37c8",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-17.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:37 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4700",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"55c24f2901e6dd85ed19776de575e8be\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1697A9D:1AB4C23:5D923385"
+    }
+  },
+  "uuid": "e79386f9-0358-4760-af21-eefcff4a37c8",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4-cafca8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4-cafca8.json
deleted file mode 100644
index 730d06350d..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4-cafca8.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "cafca820-5725-492f-abaf-12b2c96adbc6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-cafca820-5725-492f-abaf-12b2c96adbc6.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4715",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696DCB:1AB3FA7:5D923372"
-    }
-  },
-  "uuid": "cafca820-5725-492f-abaf-12b2c96adbc6",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4.json
new file mode 100644
index 0000000000..94ba87fe0e
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "cafca820-5725-492f-abaf-12b2c96adbc6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4715",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696DCB:1AB3FA7:5D923372"
+    }
+  },
+  "uuid": "cafca820-5725-492f-abaf-12b2c96adbc6",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5-1f9c12.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5-1f9c12.json
deleted file mode 100644
index 00e526f1f9..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5-1f9c12.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "1f9c125d-f4b9-4cf2-a577-db6653212d6a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1f9c125d-f4b9-4cf2-a577-db6653212d6a.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:15 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4714",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696E50:1AB4001:5D923373"
-    }
-  },
-  "uuid": "1f9c125d-f4b9-4cf2-a577-db6653212d6a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..5b82d2213c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,46 @@
+{
+  "id": "1f9c125d-f4b9-4cf2-a577-db6653212d6a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:15 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4714",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696E50:1AB4001:5D923373"
+    }
+  },
+  "uuid": "1f9c125d-f4b9-4cf2-a577-db6653212d6a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6-ce1bc2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6-ce1bc2.json
deleted file mode 100644
index 64acec86ae..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6-ce1bc2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "ce1bc2f8-f17e-463b-a950-02487f6d5dbe",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ce1bc2f8-f17e-463b-a950-02487f6d5dbe.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:16 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4713",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696ED7:1AB406B:5D923373"
-    }
-  },
-  "uuid": "ce1bc2f8-f17e-463b-a950-02487f6d5dbe",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..3005e51fb9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,46 @@
+{
+  "id": "ce1bc2f8-f17e-463b-a950-02487f6d5dbe",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:16 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4713",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696ED7:1AB406B:5D923373"
+    }
+  },
+  "uuid": "ce1bc2f8-f17e-463b-a950-02487f6d5dbe",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7-bcd9c4.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7-bcd9c4.json
deleted file mode 100644
index 5172924615..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7-bcd9c4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "bcd9c446-f8cb-4092-a284-5009153aed91",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-bcd9c446-f8cb-4092-a284-5009153aed91.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:18 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4712",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696FC9:1AB411F:5D923374"
-    }
-  },
-  "uuid": "bcd9c446-f8cb-4092-a284-5009153aed91",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..514048b3b4
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,46 @@
+{
+  "id": "bcd9c446-f8cb-4092-a284-5009153aed91",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:18 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4712",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696FC9:1AB411F:5D923374"
+    }
+  },
+  "uuid": "bcd9c446-f8cb-4092-a284-5009153aed91",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8-5f0013.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8-5f0013.json
deleted file mode 100644
index ee045ab65e..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8-5f0013.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "5f00134d-2aea-477a-8bcc-eddf19710263",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-5f00134d-2aea-477a-8bcc-eddf19710263.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4711",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
-      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1697246:1AB4224:5D923376"
-    }
-  },
-  "uuid": "5f00134d-2aea-477a-8bcc-eddf19710263",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8.json
new file mode 100644
index 0000000000..332a74b3c3
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-8.json
@@ -0,0 +1,46 @@
+{
+  "id": "5f00134d-2aea-477a-8bcc-eddf19710263",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-8.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4711",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"26bedc087d65c05e07d9d6249dfa10ff\"",
+      "Last-Modified": "Mon, 30 Sep 2019 16:55:08 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1697246:1AB4224:5D923376"
+    }
+  },
+  "uuid": "5f00134d-2aea-477a-8bcc-eddf19710263",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9-931c2b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9-931c2b.json
deleted file mode 100644
index 3c3498b8d8..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9-931c2b.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "931c2ba3-3b54-426d-a611-5c8a8dc7e400",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api\",\"description\":\"DefaultConnector\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-931c2ba3-3b54-426d-a611-5c8a8dc7e400.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:22 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4710",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:169726C:1AB44F4:5D92337A"
-    }
-  },
-  "uuid": "931c2ba3-3b54-426d-a611-5c8a8dc7e400",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9.json
new file mode 100644
index 0000000000..ad3d1b7afe
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/repos_github-api-test-org_github-api-9.json
@@ -0,0 +1,49 @@
+{
+  "id": "931c2ba3-3b54-426d-a611-5c8a8dc7e400",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api\",\"description\":\"DefaultConnector\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:22 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4710",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"f4766b04bd12aa5c8614e9ad5cff5b6f\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:169726C:1AB44F4:5D92337A"
+    }
+  },
+  "uuid": "931c2ba3-3b54-426d-a611-5c8a8dc7e400",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1-b52386.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1-b52386.json
deleted file mode 100644
index 5603edc87d..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1-b52386.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "b5238674-bdba-4cb5-ae17-49108689843a",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-b5238674-bdba-4cb5-ae17-49108689843a.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 16:55:14 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4717",
-      "X-RateLimit-Reset": "1569866107",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"843642a3b820a8cca6b146e8d5a2caf5\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EC54:5ED2:1696D5F:1AB3F1D:5D923372"
-    }
-  },
-  "uuid": "b5238674-bdba-4cb5-ae17-49108689843a",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1.json
new file mode 100644
index 0000000000..a06e4068b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/DefaultConnector/mappings/user-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "b5238674-bdba-4cb5-ae17-49108689843a",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 16:55:14 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4717",
+      "X-RateLimit-Reset": "1569866107",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"843642a3b820a8cca6b146e8d5a2caf5\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "EC54:5ED2:1696D5F:1AB3F1D:5D923372"
+    }
+  },
+  "uuid": "b5238674-bdba-4cb5-ae17-49108689843a",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/orgs_github-api-test-org-ec2931f3-a8cd-4482-a866-aca52276d270.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/orgs_github-api-test-org-ec2931f3-a8cd-4482-a866-aca52276d270.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/rate_limit-36588a64-cb68-4ea5-8995-c2cdced6b84a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/rate_limit-36588a64-cb68-4ea5-8995-c2cdced6b84a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-0db05723-d8ab-412d-bcaf-fa416eb44138.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-0db05723-d8ab-412d-bcaf-fa416eb44138.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-10.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-14.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-5432b23c-70f2-4ecf-a380-a232afeef015.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-5432b23c-70f2-4ecf-a380-a232afeef015.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/user-5dbb2b95-e55b-4185-b143-ec3f21495fa6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/user-5dbb2b95-e55b-4185-b143-ec3f21495fa6.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json
deleted file mode 100644
index 3d34b760c0..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3-ec2931.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "ec2931f3-a8cd-4482-a866-aca52276d270",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-ec2931f3-a8cd-4482-a866-aca52276d270.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4969",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ab2c566dc8a17d041f948a563e2387f0\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBD4:8499:15E0D01:19F3DCF:5D9258A5"
-    }
-  },
-  "uuid": "ec2931f3-a8cd-4482-a866-aca52276d270",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..b384128df1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,43 @@
+{
+  "id": "ec2931f3-a8cd-4482-a866-aca52276d270",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4969",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ab2c566dc8a17d041f948a563e2387f0\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBD4:8499:15E0D01:19F3DCF:5D9258A5"
+    }
+  },
+  "uuid": "ec2931f3-a8cd-4482-a866-aca52276d270",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json
deleted file mode 100644
index 08a11e6529..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2-36588a.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "36588a64-cb68-4ea5-8995-c2cdced6b84a",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-36588a64-cb68-4ea5-8995-c2cdced6b84a.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "FBD4:8499:15E0CF6:19F3DA6:5D9258A5"
-    }
-  },
-  "uuid": "36588a64-cb68-4ea5-8995-c2cdced6b84a",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..eee631038c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/rate_limit-2.json
@@ -0,0 +1,38 @@
+{
+  "id": "36588a64-cb68-4ea5-8995-c2cdced6b84a",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "FBD4:8499:15E0CF6:19F3DA6:5D9258A5"
+    }
+  },
+  "uuid": "36588a64-cb68-4ea5-8995-c2cdced6b84a",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json
deleted file mode 100644
index dba271c2c4..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10-5432b2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "5432b23c-70f2-4ecf-a380-a232afeef015",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-5432b23c-70f2-4ecf-a380-a232afeef015.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4966",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4f508593b64df214fee8f6ab42df633c\"",
-      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBD4:8499:15E11B0:19F4373:5D9258AD"
-    }
-  },
-  "uuid": "5432b23c-70f2-4ecf-a380-a232afeef015",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-3-repos-github-api-test-org-github-api-0",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10.json
new file mode 100644
index 0000000000..be92cd205b
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-10-10.json
@@ -0,0 +1,46 @@
+{
+  "id": "5432b23c-70f2-4ecf-a380-a232afeef015",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-10.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4966",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4f508593b64df214fee8f6ab42df633c\"",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBD4:8499:15E11B0:19F4373:5D9258AD"
+    }
+  },
+  "uuid": "5432b23c-70f2-4ecf-a380-a232afeef015",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-3-repos-github-api-test-org-github-api-0",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11-2e2a6e.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-11-11.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12-a9ae79.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-12-12.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13-b2221a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-13-13.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json
deleted file mode 100644
index 60b0f9d689..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14-7e396e.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "id": "7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET",
-    "headers": {
-      "If-None-Match": {
-        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4963",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"31f73a7ecc35bbecec125851ce166af4\"",
-      "Last-Modified": "{{now offset='-7 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBD4:8499:15E153D:19F4735:5D9258B4"
-    }
-  },
-  "uuid": "7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-3-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-4-repos-github-api-test-org-github-api-0",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14.json
new file mode 100644
index 0000000000..67701f948f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-14-14.json
@@ -0,0 +1,51 @@
+{
+  "id": "7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET",
+    "headers": {
+      "If-None-Match": {
+        "equalTo": "\"4f508593b64df214fee8f6ab42df633c\""
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-14.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4963",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"31f73a7ecc35bbecec125851ce166af4\"",
+      "Last-Modified": "{{now offset='-7 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBD4:8499:15E153D:19F4735:5D9258B4"
+    }
+  },
+  "uuid": "7e396e4c-c5eb-4bc0-a5cd-3d9f75fac0f0",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-3-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-4-repos-github-api-test-org-github-api-0",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15-bc8d8b.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-15-15.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16-3857dc.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-16-16.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17-4d123b.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-17-17.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json
deleted file mode 100644
index 66a8fdf139..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4-b99f84.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4968",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"295ae3430c604f3d10b6eb145fe511b5\"",
-      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBD4:8499:15E0D13:19F3DE8:5D9258A5"
-    }
-  },
-  "uuid": "b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-0",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4.json
new file mode 100644
index 0000000000..d2ba1e0c70
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-4-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4968",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"295ae3430c604f3d10b6eb145fe511b5\"",
+      "Last-Modified": "{{now offset='-1 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBD4:8499:15E0D13:19F3DE8:5D9258A5"
+    }
+  },
+  "uuid": "b99f84bd-4eaa-4aeb-8f1c-ba64e617d15f",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-repos-github-api-test-org-github-api-0",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5-5e7b86.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-5-5.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6-e20958.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-6-6.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7-597005.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-7-7.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8-441d13.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-8-8.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json
deleted file mode 100644
index 8f6b66fbd7..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9-0db057.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "0db05723-d8ab-412d-bcaf-fa416eb44138",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api\",\"description\":\"OkHttpConnector_Cache_MaxAgeDefault_Zero\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-0db05723-d8ab-412d-bcaf-fa416eb44138.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4967",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"4f508593b64df214fee8f6ab42df633c\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBD4:8499:15E111E:19F42C0:5D9258AD"
-    }
-  },
-  "uuid": "0db05723-d8ab-412d-bcaf-fa416eb44138",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9.json
new file mode 100644
index 0000000000..60ec3472ad
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/repos_github-api-test-org_github-api-9-9.json
@@ -0,0 +1,49 @@
+{
+  "id": "0db05723-d8ab-412d-bcaf-fa416eb44138",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api\",\"description\":\"OkHttpConnector_Cache_MaxAgeDefault_Zero\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4967",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"4f508593b64df214fee8f6ab42df633c\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBD4:8499:15E111E:19F42C0:5D9258AD"
+    }
+  },
+  "uuid": "0db05723-d8ab-412d-bcaf-fa416eb44138",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json
deleted file mode 100644
index 3911393e7e..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1-5dbb2b.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "5dbb2b95-e55b-4185-b143-ec3f21495fa6",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-5dbb2b95-e55b-4185-b143-ec3f21495fa6.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4970",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"147519bb6367cc3d5d5a9d2a21de3937\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "FBD4:8499:15E0CCD:19F3D92:5D9258A4"
-    }
-  },
-  "uuid": "5dbb2b95-e55b-4185-b143-ec3f21495fa6",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1.json
new file mode 100644
index 0000000000..a1472b5d80
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeDefault_Zero/mappings/user-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "5dbb2b95-e55b-4185-b143-ec3f21495fa6",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4970",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"147519bb6367cc3d5d5a9d2a21de3937\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "FBD4:8499:15E0CCD:19F3D92:5D9258A4"
+    }
+  },
+  "uuid": "5dbb2b95-e55b-4185-b143-ec3f21495fa6",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/orgs_github-api-test-org-1d3815b7-1441-4a5d-a4eb-ffa13c700503.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/orgs_github-api-test-org-1d3815b7-1441-4a5d-a4eb-ffa13c700503.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/rate_limit-b23929e7-7216-403a-b1c4-1b0c2ecf6f85.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/rate_limit-b23929e7-7216-403a-b1c4-1b0c2ecf6f85.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-ec57e178-8204-439b-b45a-58c773fa46f6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-ec57e178-8204-439b-b45a-58c773fa46f6.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-02d53c37-9838-422a-9184-a08ef1487126.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-02d53c37-9838-422a-9184-a08ef1487126.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-82db6373-85d8-4fc9-97c7-b98612c52402.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-82db6373-85d8-4fc9-97c7-b98612c52402.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/user-d958863f-a1fb-4a46-bc43-aeccd3eef451.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/user-d958863f-a1fb-4a46-bc43-aeccd3eef451.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json
deleted file mode 100644
index 1f56b43aba..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3-1d3815.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "1d3815b7-1441-4a5d-a4eb-ffa13c700503",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-1d3815b7-1441-4a5d-a4eb-ffa13c700503.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4983",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ab2c566dc8a17d041f948a563e2387f0\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F814:753B:922AE6:AD6CCB:5D924DE1"
-    }
-  },
-  "uuid": "1d3815b7-1441-4a5d-a4eb-ffa13c700503",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..db757810e9
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,43 @@
+{
+  "id": "1d3815b7-1441-4a5d-a4eb-ffa13c700503",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4983",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ab2c566dc8a17d041f948a563e2387f0\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F814:753B:922AE6:AD6CCB:5D924DE1"
+    }
+  },
+  "uuid": "1d3815b7-1441-4a5d-a4eb-ffa13c700503",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json
deleted file mode 100644
index 16bbe025c8..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2-b23929.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "b23929e7-7216-403a-b1c4-1b0c2ecf6f85",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-b23929e7-7216-403a-b1c4-1b0c2ecf6f85.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4984",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "F814:753B:922AD8:AD6C9C:5D924DE0"
-    }
-  },
-  "uuid": "b23929e7-7216-403a-b1c4-1b0c2ecf6f85",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..0e8af0984a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/rate_limit-2.json
@@ -0,0 +1,38 @@
+{
+  "id": "b23929e7-7216-403a-b1c4-1b0c2ecf6f85",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4984",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "F814:753B:922AD8:AD6C9C:5D924DE0"
+    }
+  },
+  "uuid": "b23929e7-7216-403a-b1c4-1b0c2ecf6f85",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json
deleted file mode 100644
index 59a97b08f2..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4-ec57e1.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "ec57e178-8204-439b-b45a-58c773fa46f6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-ec57e178-8204-439b-b45a-58c773fa46f6.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4982",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ef30773e1dfdb07ba4ea64143df970ab\"",
-      "Last-Modified": "{{now offset='-20 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F814:753B:922AFD:AD6CE0:5D924DE1"
-    }
-  },
-  "uuid": "ec57e178-8204-439b-b45a-58c773fa46f6",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4.json
new file mode 100644
index 0000000000..fa010ea57a
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "ec57e178-8204-439b-b45a-58c773fa46f6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4982",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ef30773e1dfdb07ba4ea64143df970ab\"",
+      "Last-Modified": "{{now offset='-20 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F814:753B:922AFD:AD6CE0:5D924DE1"
+    }
+  },
+  "uuid": "ec57e178-8204-439b-b45a-58c773fa46f6",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json
deleted file mode 100644
index d3f787386f..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5-82db63.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "82db6373-85d8-4fc9-97c7-b98612c52402",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api\",\"description\":\"OkHttpConnector_Cache_MaxAgeNone\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-82db6373-85d8-4fc9-97c7-b98612c52402.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ff0623de72a672b583e0f4473a5bb57c\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F814:753B:922CAA:AD6D0A:5D924DE1"
-    }
-  },
-  "uuid": "82db6373-85d8-4fc9-97c7-b98612c52402",
-  "persistent": true,
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..0054a3c329
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,49 @@
+{
+  "id": "82db6373-85d8-4fc9-97c7-b98612c52402",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api\",\"description\":\"OkHttpConnector_Cache_MaxAgeNone\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ff0623de72a672b583e0f4473a5bb57c\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F814:753B:922CAA:AD6D0A:5D924DE1"
+    }
+  },
+  "uuid": "82db6373-85d8-4fc9-97c7-b98612c52402",
+  "persistent": true,
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json
deleted file mode 100644
index 01da361c2c..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6-02d53c.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "02d53c37-9838-422a-9184-a08ef1487126",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-02d53c37-9838-422a-9184-a08ef1487126.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ff0623de72a672b583e0f4473a5bb57c\"",
-      "Last-Modified": "{{now offset='-20 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F814:753B:922CC3:AD6EF3:5D924DE7"
-    }
-  },
-  "uuid": "02d53c37-9838-422a-9184-a08ef1487126",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..98ac82941d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,45 @@
+{
+  "id": "02d53c37-9838-422a-9184-a08ef1487126",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ff0623de72a672b583e0f4473a5bb57c\"",
+      "Last-Modified": "{{now offset='-20 seconds' timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F814:753B:922CC3:AD6EF3:5D924DE7"
+    }
+  },
+  "uuid": "02d53c37-9838-422a-9184-a08ef1487126",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json
deleted file mode 100644
index 73d821da0c..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1-d95886.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "d958863f-a1fb-4a46-bc43-aeccd3eef451",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-d958863f-a1fb-4a46-bc43-aeccd3eef451.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4984",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"147519bb6367cc3d5d5a9d2a21de3937\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "F814:753B:922AB8:AD6C88:5D924DE0"
-    }
-  },
-  "uuid": "d958863f-a1fb-4a46-bc43-aeccd3eef451",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1.json
new file mode 100644
index 0000000000..f371153069
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_Cache_MaxAgeNone/mappings/user-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "d958863f-a1fb-4a46-bc43-aeccd3eef451",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4984",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"147519bb6367cc3d5d5a9d2a21de3937\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "F814:753B:922AB8:AD6C88:5D924DE0"
+    }
+  },
+  "uuid": "d958863f-a1fb-4a46-bc43-aeccd3eef451",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/orgs_github-api-test-org-82590d42-fccd-4d3b-8f87-b5b9c1bb672b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/orgs_github-api-test-org-3.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/orgs_github-api-test-org-82590d42-fccd-4d3b-8f87-b5b9c1bb672b.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/orgs_github-api-test-org-3.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/rate_limit-e76bb3c7-edf0-4cc4-9e62-0163e5910625.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/rate_limit-2.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/rate_limit-e76bb3c7-edf0-4cc4-9e62-0163e5910625.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/rate_limit-2.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-14477383-aab7-4a52-8d72-47e1ad29a34d.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-10.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-14477383-aab7-4a52-8d72-47e1ad29a34d.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-10.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-31849f9f-0c72-4167-b458-853164cbb677.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-11.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-31849f9f-0c72-4167-b458-853164cbb677.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-11.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-49fce600-b69e-4ef7-af64-594450ae1a1a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-12.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-49fce600-b69e-4ef7-af64-594450ae1a1a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-12.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-703fd12f-995a-4af9-8504-10ff32c81100.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-13.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-703fd12f-995a-4af9-8504-10ff32c81100.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-13.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-1ec048c4-808b-4541-a821-18f196cc23fe.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-14.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-1ec048c4-808b-4541-a821-18f196cc23fe.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-14.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-3e8ef833-99b0-4c1d-99e9-e7fd9cc26024.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-15.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-3e8ef833-99b0-4c1d-99e9-e7fd9cc26024.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-15.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-8a71a8b0-9915-4365-b581-5ca05b407fc6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-16.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-8a71a8b0-9915-4365-b581-5ca05b407fc6.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-16.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-17.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-17.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-50e14b70-b8b5-4124-bc6e-b7d68a05ef3a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-4.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-50e14b70-b8b5-4124-bc6e-b7d68a05ef3a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-4.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-57466b15-e7fb-46de-88ca-2ab26cc0fe7d.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-5.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-57466b15-e7fb-46de-88ca-2ab26cc0fe7d.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-5.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-720bd2cb-d00e-46c5-903f-3456521e4345.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-6.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-720bd2cb-d00e-46c5-903f-3456521e4345.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-6.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-766326ea-da2e-4fe5-bea2-157db149047a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-7.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-766326ea-da2e-4fe5-bea2-157db149047a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-7.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-99fb84f6-79c5-424c-ba10-007a9912567a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-8.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-99fb84f6-79c5-424c-ba10-007a9912567a.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-8.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-d7826ada-76b1-467b-b83e-9a1f3c30a719.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-9.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-d7826ada-76b1-467b-b83e-9a1f3c30a719.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/repos_github-api-test-org_github-api-9.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/user-754481d3-2e4b-4ed4-92d0-73795dac7985.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/user-1.json
similarity index 100%
rename from src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/user-754481d3-2e4b-4ed4-92d0-73795dac7985.json
rename to src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/__files/user-1.json
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json
deleted file mode 100644
index bb80d4aaaa..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3-82590d.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "82590d42-fccd-4d3b-8f87-b5b9c1bb672b",
-  "name": "orgs_github-api-test-org",
-  "request": {
-    "url": "/orgs/github-api-test-org",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "orgs_github-api-test-org-82590d42-fccd-4d3b-8f87-b5b9c1bb672b.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4994",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"ab2c566dc8a17d041f948a563e2387f0\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E1DD:1606336:5D923877"
-    }
-  },
-  "uuid": "82590d42-fccd-4d3b-8f87-b5b9c1bb672b",
-  "persistent": true,
-  "insertionIndex": 3
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3.json
new file mode 100644
index 0000000000..b308cc7614
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/orgs_github-api-test-org-3.json
@@ -0,0 +1,43 @@
+{
+  "id": "82590d42-fccd-4d3b-8f87-b5b9c1bb672b",
+  "name": "orgs_github-api-test-org",
+  "request": {
+    "url": "/orgs/github-api-test-org",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_github-api-test-org-3.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4994",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"ab2c566dc8a17d041f948a563e2387f0\"",
+      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E1DD:1606336:5D923877"
+    }
+  },
+  "uuid": "82590d42-fccd-4d3b-8f87-b5b9c1bb672b",
+  "persistent": true,
+  "insertionIndex": 3
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json
deleted file mode 100644
index 2fa7be150e..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2-e76bb3.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "id": "e76bb3c7-edf0-4cc4-9e62-0163e5910625",
-  "name": "rate_limit",
-  "request": {
-    "url": "/rate_limit",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "rate_limit-e76bb3c7-edf0-4cc4-9e62-0163e5910625.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:39 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4995",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "no-cache",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "Vary": "Accept-Encoding",
-      "X-GitHub-Request-Id": "ED63:7341:128E1D0:1606317:5D923876"
-    }
-  },
-  "uuid": "e76bb3c7-edf0-4cc4-9e62-0163e5910625",
-  "persistent": true,
-  "insertionIndex": 2
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2.json
new file mode 100644
index 0000000000..06f68a52f2
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/rate_limit-2.json
@@ -0,0 +1,38 @@
+{
+  "id": "e76bb3c7-edf0-4cc4-9e62-0163e5910625",
+  "name": "rate_limit",
+  "request": {
+    "url": "/rate_limit",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "rate_limit-2.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:39 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4995",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "no-cache",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding",
+      "X-GitHub-Request-Id": "ED63:7341:128E1D0:1606317:5D923876"
+    }
+  },
+  "uuid": "e76bb3c7-edf0-4cc4-9e62-0163e5910625",
+  "persistent": true,
+  "insertionIndex": 2
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json
deleted file mode 100644
index bf7ce092b2..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10-d7826a.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "d7826ada-76b1-467b-b83e-9a1f3c30a719",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-d7826ada-76b1-467b-b83e-9a1f3c30a719.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4987",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E582:1606778:5D92387F"
-    }
-  },
-  "uuid": "d7826ada-76b1-467b-b83e-9a1f3c30a719",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
-  "insertionIndex": 10
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10.json
new file mode 100644
index 0000000000..1cebc7c0dc
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-10.json
@@ -0,0 +1,46 @@
+{
+  "id": "d7826ada-76b1-467b-b83e-9a1f3c30a719",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-10.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4987",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E582:1606778:5D92387F"
+    }
+  },
+  "uuid": "d7826ada-76b1-467b-b83e-9a1f3c30a719",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
+  "insertionIndex": 10
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json
deleted file mode 100644
index d82af3faf0..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11-144773.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "14477383-aab7-4a52-8d72-47e1ad29a34d",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-14477383-aab7-4a52-8d72-47e1ad29a34d.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:48 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4986",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E5CC:160679A:5D92387F"
-    }
-  },
-  "uuid": "14477383-aab7-4a52-8d72-47e1ad29a34d",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
-  "insertionIndex": 11
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11.json
new file mode 100644
index 0000000000..300a84de0d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-11.json
@@ -0,0 +1,46 @@
+{
+  "id": "14477383-aab7-4a52-8d72-47e1ad29a34d",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-11.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4986",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E5CC:160679A:5D92387F"
+    }
+  },
+  "uuid": "14477383-aab7-4a52-8d72-47e1ad29a34d",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-7",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
+  "insertionIndex": 11
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json
deleted file mode 100644
index b5f0dd01e3..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12-49fce6.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "49fce600-b69e-4ef7-af64-594450ae1a1a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-49fce600-b69e-4ef7-af64-594450ae1a1a.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:50 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4985",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E68E:16067FC:5D923880"
-    }
-  },
-  "uuid": "49fce600-b69e-4ef7-af64-594450ae1a1a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
-  "insertionIndex": 12
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12.json
new file mode 100644
index 0000000000..02fb5d2d2d
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-12.json
@@ -0,0 +1,46 @@
+{
+  "id": "49fce600-b69e-4ef7-af64-594450ae1a1a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-12.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:50 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4985",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E68E:16067FC:5D923880"
+    }
+  },
+  "uuid": "49fce600-b69e-4ef7-af64-594450ae1a1a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-8",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
+  "insertionIndex": 12
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json
deleted file mode 100644
index 36ec73fca9..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13-31849f.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "31849f9f-0c72-4167-b458-853164cbb677",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-31849f9f-0c72-4167-b458-853164cbb677.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:54 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4984",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E88D:16068DC:5D923882"
-    }
-  },
-  "uuid": "31849f9f-0c72-4167-b458-853164cbb677",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
-  "insertionIndex": 13
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13.json
new file mode 100644
index 0000000000..a83a980f98
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-13.json
@@ -0,0 +1,46 @@
+{
+  "id": "31849f9f-0c72-4167-b458-853164cbb677",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-13.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:54 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4984",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E88D:16068DC:5D923882"
+    }
+  },
+  "uuid": "31849f9f-0c72-4167-b458-853164cbb677",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-9",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
+  "insertionIndex": 13
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json
deleted file mode 100644
index a191d6e9cc..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14-8a71a8.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "8a71a8b0-9915-4365-b581-5ca05b407fc6",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-8a71a8b0-9915-4365-b581-5ca05b407fc6.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:55 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4981",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E90A:1606B21:5D923886"
-    }
-  },
-  "uuid": "8a71a8b0-9915-4365-b581-5ca05b407fc6",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
-  "insertionIndex": 14
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14.json
new file mode 100644
index 0000000000..900ccb1bf1
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-14.json
@@ -0,0 +1,46 @@
+{
+  "id": "8a71a8b0-9915-4365-b581-5ca05b407fc6",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-14.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:55 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4981",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E90A:1606B21:5D923886"
+    }
+  },
+  "uuid": "8a71a8b0-9915-4365-b581-5ca05b407fc6",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-10",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
+  "insertionIndex": 14
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json
deleted file mode 100644
index 12277b13dd..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15-e6a8cc.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:56 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4980",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E95F:1606BB7:5D923887"
-    }
-  },
-  "uuid": "e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
-  "insertionIndex": 15
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15.json
new file mode 100644
index 0000000000..c43c1e7da0
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-15.json
@@ -0,0 +1,46 @@
+{
+  "id": "e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-15.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:56 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4980",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E95F:1606BB7:5D923887"
+    }
+  },
+  "uuid": "e6a8cc79-dd4c-4ff8-9a46-ce9c304fbace",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-11",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
+  "insertionIndex": 15
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json
deleted file mode 100644
index 546ad809c2..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16-1ec048.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "1ec048c4-808b-4541-a821-18f196cc23fe",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-1ec048c4-808b-4541-a821-18f196cc23fe.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:57 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4979",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E9DC:1606C32:5D923888"
-    }
-  },
-  "uuid": "1ec048c4-808b-4541-a821-18f196cc23fe",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
-  "insertionIndex": 16
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16.json
new file mode 100644
index 0000000000..0e97f83409
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-16.json
@@ -0,0 +1,46 @@
+{
+  "id": "1ec048c4-808b-4541-a821-18f196cc23fe",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-16.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:57 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4979",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E9DC:1606C32:5D923888"
+    }
+  },
+  "uuid": "1ec048c4-808b-4541-a821-18f196cc23fe",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-12",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
+  "insertionIndex": 16
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json
deleted file mode 100644
index e7b8c20ea4..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17-3e8ef8.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "id": "3e8ef833-99b0-4c1d-99e9-e7fd9cc26024",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-3e8ef833-99b0-4c1d-99e9-e7fd9cc26024.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:17:02 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4978",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128EBB8:1606CAD:5D923889"
-    }
-  },
-  "uuid": "3e8ef833-99b0-4c1d-99e9-e7fd9cc26024",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
-  "insertionIndex": 17
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17.json
new file mode 100644
index 0000000000..ce78200a73
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-17.json
@@ -0,0 +1,45 @@
+{
+  "id": "3e8ef833-99b0-4c1d-99e9-e7fd9cc26024",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-17.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:17:02 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4978",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"bb6e00d619256e29fb3c48198a09436c\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:55 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128EBB8:1606CAD:5D923889"
+    }
+  },
+  "uuid": "3e8ef833-99b0-4c1d-99e9-e7fd9cc26024",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-13",
+  "insertionIndex": 17
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json
deleted file mode 100644
index 972b0b0eb1..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4-99fb84.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "99fb84f6-79c5-424c-ba10-007a9912567a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-99fb84f6-79c5-424c-ba10-007a9912567a.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4993",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E1EB:160634A:5D923877"
-    }
-  },
-  "uuid": "99fb84f6-79c5-424c-ba10-007a9912567a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "insertionIndex": 4
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4.json
new file mode 100644
index 0000000000..3691c4b507
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-4.json
@@ -0,0 +1,46 @@
+{
+  "id": "99fb84f6-79c5-424c-ba10-007a9912567a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-4.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4993",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E1EB:160634A:5D923877"
+    }
+  },
+  "uuid": "99fb84f6-79c5-424c-ba10-007a9912567a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "insertionIndex": 4
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json
deleted file mode 100644
index a81675ba61..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5-57466b.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "57466b15-e7fb-46de-88ca-2ab26cc0fe7d",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-57466b15-e7fb-46de-88ca-2ab26cc0fe7d.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:40 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4992",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E22A:1606395:5D923878"
-    }
-  },
-  "uuid": "57466b15-e7fb-46de-88ca-2ab26cc0fe7d",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "insertionIndex": 5
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5.json
new file mode 100644
index 0000000000..7f553cb084
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-5.json
@@ -0,0 +1,46 @@
+{
+  "id": "57466b15-e7fb-46de-88ca-2ab26cc0fe7d",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-5.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:40 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4992",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E22A:1606395:5D923878"
+    }
+  },
+  "uuid": "57466b15-e7fb-46de-88ca-2ab26cc0fe7d",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-2",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "insertionIndex": 5
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json
deleted file mode 100644
index b9b2fe4b89..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6-766326.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "766326ea-da2e-4fe5-bea2-157db149047a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-766326ea-da2e-4fe5-bea2-157db149047a.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:41 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4991",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E2A2:16063C7:5D923878"
-    }
-  },
-  "uuid": "766326ea-da2e-4fe5-bea2-157db149047a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "insertionIndex": 6
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6.json
new file mode 100644
index 0000000000..5cbe070d19
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-6.json
@@ -0,0 +1,46 @@
+{
+  "id": "766326ea-da2e-4fe5-bea2-157db149047a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-6.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:41 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4991",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E2A2:16063C7:5D923878"
+    }
+  },
+  "uuid": "766326ea-da2e-4fe5-bea2-157db149047a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-3",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json
deleted file mode 100644
index 404ad47bd2..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7-720bd2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "720bd2cb-d00e-46c5-903f-3456521e4345",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-720bd2cb-d00e-46c5-903f-3456521e4345.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:42 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4990",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E339:1606445:5D923879"
-    }
-  },
-  "uuid": "720bd2cb-d00e-46c5-903f-3456521e4345",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "insertionIndex": 7
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7.json
new file mode 100644
index 0000000000..257f435d8c
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-7.json
@@ -0,0 +1,46 @@
+{
+  "id": "720bd2cb-d00e-46c5-903f-3456521e4345",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-7.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:42 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4990",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E339:1606445:5D923879"
+    }
+  },
+  "uuid": "720bd2cb-d00e-46c5-903f-3456521e4345",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-4",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json
deleted file mode 100644
index 12ade21c18..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8-50e14b.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "id": "50e14b70-b8b5-4124-bc6e-b7d68a05ef3a",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-50e14b70-b8b5-4124-bc6e-b7d68a05ef3a.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4989",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
-      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E50E:16064F7:5D92387A"
-    }
-  },
-  "uuid": "50e14b70-b8b5-4124-bc6e-b7d68a05ef3a",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
-  "insertionIndex": 8
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8.json
new file mode 100644
index 0000000000..51aaae0589
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-8.json
@@ -0,0 +1,46 @@
+{
+  "id": "50e14b70-b8b5-4124-bc6e-b7d68a05ef3a",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-8.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4989",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7fa8062862550f8bfc3038515c4c2353\"",
+      "Last-Modified": "Mon, 30 Sep 2019 17:16:33 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E50E:16064F7:5D92387A"
+    }
+  },
+  "uuid": "50e14b70-b8b5-4124-bc6e-b7d68a05ef3a",
+  "persistent": true,
+  "scenarioName": "scenario-1-repos-github-api-test-org-github-api",
+  "requiredScenarioState": "scenario-1-repos-github-api-test-org-github-api-5",
+  "newScenarioState": "scenario-1-repos-github-api-test-org-github-api-6",
+  "insertionIndex": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json
deleted file mode 100644
index aca31b695f..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9-703fd1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "id": "703fd12f-995a-4af9-8504-10ff32c81100",
-  "name": "repos_github-api-test-org_github-api",
-  "request": {
-    "url": "/repos/github-api-test-org/github-api",
-    "method": "PATCH",
-    "bodyPatterns": [
-      {
-        "equalToJson": "{\"name\":\"github-api\",\"description\":\"OkHttpConnector_NoCache\"}",
-        "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
-      }
-    ]
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_github-api-703fd12f-995a-4af9-8504-10ff32c81100.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:47 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4988",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E54A:1606743:5D92387F"
-    }
-  },
-  "uuid": "703fd12f-995a-4af9-8504-10ff32c81100",
-  "persistent": true,
-  "insertionIndex": 9
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9.json
new file mode 100644
index 0000000000..eb8b31cc85
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/repos_github-api-test-org_github-api-9.json
@@ -0,0 +1,49 @@
+{
+  "id": "703fd12f-995a-4af9-8504-10ff32c81100",
+  "name": "repos_github-api-test-org_github-api",
+  "request": {
+    "url": "/repos/github-api-test-org/github-api",
+    "method": "PATCH",
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"name\":\"github-api\",\"description\":\"OkHttpConnector_NoCache\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": true
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_github-api-test-org_github-api-9.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:47 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4988",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"be4dcd1642bda414711f76068b3ec3b4\"",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E54A:1606743:5D92387F"
+    }
+  },
+  "uuid": "703fd12f-995a-4af9-8504-10ff32c81100",
+  "persistent": true,
+  "insertionIndex": 9
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json
deleted file mode 100644
index c983a164eb..0000000000
--- a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1-754481.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "id": "754481d3-2e4b-4ed4-92d0-73795dac7985",
-  "name": "user",
-  "request": {
-    "url": "/user",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "user-754481d3-2e4b-4ed4-92d0-73795dac7985.json",
-    "headers": {
-      "Date": "Mon, 30 Sep 2019 17:16:38 GMT",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4995",
-      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"147519bb6367cc3d5d5a9d2a21de3937\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
-      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
-      "X-Accepted-OAuth-Scopes": "",
-      "X-GitHub-Media-Type": "github.v3; format=json",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "ED63:7341:128E1B5:1606306:5D923876"
-    }
-  },
-  "uuid": "754481d3-2e4b-4ed4-92d0-73795dac7985",
-  "persistent": true,
-  "insertionIndex": 1
-}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1.json b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1.json
new file mode 100644
index 0000000000..1331785f3f
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/extras/OkHttpConnectorTest/wiremock/OkHttpConnector_NoCache/mappings/user-1.json
@@ -0,0 +1,43 @@
+{
+  "id": "754481d3-2e4b-4ed4-92d0-73795dac7985",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 30 Sep 2019 17:16:38 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4995",
+      "X-RateLimit-Reset": "{{now offset='1 hours' format='unix'}}",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"147519bb6367cc3d5d5a9d2a21de3937\"",
+      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "X-OAuth-Scopes": "gist, notifications, read:org, read:public_key, read:repo_hook, repo",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "github.v3; format=json",
+      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
+      "Access-Control-Allow-Origin": "*",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "ED63:7341:128E1B5:1606306:5D923876"
+    }
+  },
+  "uuid": "754481d3-2e4b-4ed4-92d0-73795dac7985",
+  "persistent": true,
+  "insertionIndex": 1
+}
\ No newline at end of file